Attachment #2216 for bug #2224

View | Details | Raw Unified | Return to bug 2224
Collapse All | Expand All




  {
    m_txop->CompleteAmpduTransfer (recipient, tid);
  }
  virtual void SetAmpdu (Mac48Address dest, bool enableAmpdu)
  {
    return m_txop->SetAmpduExist (dest, enableAmpdu);
  }
  virtual void CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp)
  {

    m_currentPacket (0),
    m_aggregator (0),
    m_typeOfStation (STA),
    m_blockAckType (COMPRESSED_BLOCK_ACK)
    m_ampduExist (false)
{
  NS_LOG_FUNCTION (this);
  m_transmissionListener = new EdcaTxopN::TransmissionListener (this);

          params.DisableNextData ();
          m_low->StartTransmission (m_currentPacket, &m_currentHdr,
                                    params, m_transmissionListener);
          if (!GetAmpduExist (m_currentHdr.GetAddr1 ()))
            {
              CompleteTx ();
            }

        {
          m_txFailedCallback (m_currentHdr);
        }
      if (GetAmpduExist (m_currentHdr.GetAddr1 ()))
        {
          m_low->FlushAggregateQueue ();
          uint8_t tid = 0;

        {
          m_txFailedCallback (m_currentHdr);
        }
      if (GetAmpduExist (m_currentHdr.GetAddr1 ()))
        {
          uint8_t tid = 0;
          if (m_currentHdr.IsQosData ())

  NS_LOG_DEBUG ("missed block ack");
  if (NeedBarRetransmission ())
    {
      if (!GetAmpduExist (m_currentHdr.GetAddr1 ()))
        {
          //should i report this to station addressed by ADDR1?
          NS_LOG_DEBUG ("Retransmit block ack request");

    }
}

bool EdcaTxopN::GetAmpduExist (Mac48Address dest)
{
  NS_LOG_FUNCTION (this << dest);
  if (m_aMpduEnabled.find (dest) != m_aMpduEnabled.end ())
    {
      return m_aMpduEnabled.find (dest)->second;
    }
  return false;
}

void EdcaTxopN::SetAmpduExist (Mac48Address dest, bool enableAmpdu)
{
  NS_LOG_FUNCTION (this << dest << enableAmpdu);
  if (m_aMpduEnabled.find (dest) != m_aMpduEnabled.end () && m_aMpduEnabled.find (dest)->second != enableAmpdu)
    {
      m_aMpduEnabled.erase (m_aMpduEnabled.find (dest));
    }
  if (m_aMpduEnabled.find (dest) == m_aMpduEnabled.end ())
    {
      m_aMpduEnabled.insert (std::make_pair (dest, enableAmpdu));
    }
}

void

(-)a/src/wifi/model/edca-txop-n.h (-3 / +5 lines)

Lines 92-97	Link Here

   * packet transmission was failed.

   * packet transmission was failed.

*/

*/

  typedef Callback <void, const WifiMacHeader&> TxFailed;

  typedef Callback <void, const WifiMacHeader&> TxFailed;

  typedef std::map<Mac48Address, bool> AmpduEnabled;

  AmpduEnabled m_aMpduEnabled;

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  EdcaTxopN ();

100

  EdcaTxopN ();

Lines 411-418	Link Here

411

  void SetBlockAckInactivityTimeout (uint16_t timeout);

414

  void SetBlockAckInactivityTimeout (uint16_t timeout);

412

  void SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator);

415

  void SendDelbaFrame (Mac48Address addr, uint8_t tid, bool byOriginator);

413

  void CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp);

416

  void CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp);

414

  bool GetAmpduExist (void);

417

  bool GetAmpduExist (Mac48Address dest);

415

  void SetAmpduExist (bool ampdu);

418

  void SetAmpduExist (Mac48Address dest, bool enableAmpdu);

416

419

417

/**

420

/**

418

   * Return the next sequence number for the given header.

421

   * Return the next sequence number for the given header.

Lines 555-561	Link Here

555

  Time m_currentPacketTimestamp;

558

  Time m_currentPacketTimestamp;

556

  uint16_t m_blockAckInactivityTimeout;

559

  uint16_t m_blockAckInactivityTimeout;

557

  struct Bar m_currentBar;

560

  struct Bar m_currentBar;

558

  bool m_ampduExist;

559

};

561

};

560

562

561

} //namespace ns3

563

} //namespace ns3




MacLowAggregationCapableTransmissionListener::~MacLowAggregationCapableTransmissionListener ()
{
}
void MacLowAggregationCapableTransmissionListener::SetAmpdu (Mac48Address dest, bool enableAmpdu)
{
}
void MacLowAggregationCapableTransmissionListener::CompleteTransfer (Mac48Address address, uint8_t tid)

                  newPacket = currentAggregatedPacket;
                  newPacket->AddPacketTag (ampdutag);
                  NS_LOG_DEBUG ("tx unicast A-MPDU");
                  listenerIt->second->SetAmpdu (hdr.GetAddr2 (), true);
                }
              else
                {

              newPacket->AddPacketTag (ampdutag);

              NS_LOG_DEBUG ("tx unicast VHT single MPDU with sequence number " << hdr.GetSequenceNumber ());
              listenerIt->second->SetAmpdu (hdr.GetAddr2 (), true);
            }
        }
    }

(-)a/src/wifi/model/mac-low.h (-1 / +1 lines)

Lines 221-227	Link Here

221

   * of an A-MPDU with ImmediateBlockAck policy (i.e. no BAR is scheduled)

221

   * of an A-MPDU with ImmediateBlockAck policy (i.e. no BAR is scheduled)

222

*/

222

*/

223

  virtual void CompleteTransfer (Mac48Address address, uint8_t tid);

223

  virtual void CompleteTransfer (Mac48Address address, uint8_t tid);

224

  virtual void SetAmpdu (bool ampdu);

224

  virtual void SetAmpdu (Mac48Address dest, bool enableAmpdu);

225

/**

225

/**

226

   * This function stores an MPDU (part of an A-MPDU) in blockackagreement (i.e. the sender is waiting

226

   * This function stores an MPDU (part of an A-MPDU) in blockackagreement (i.e. the sender is waiting

227

   * for a blockack containing the sequence number of this MPDU).

227

   * for a blockack containing the sequence number of this MPDU).

Return to bug 2224