Attachment #1989 for bug #2075

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




      if (GetAmpduExist())
        {
          m_low->FlushAggregateQueue ();
          
          NS_LOG_DEBUG ("Transmit Block Ack Request");
          CtrlBAckRequestHeader reqHdr;
          reqHdr.SetType (COMPRESSED_BLOCK_ACK);
          uint8_t tid = m_currentHdr.GetQosTid ();
          reqHdr.SetStartingSequence (m_txMiddle->PeekNextSequenceNumberfor (&m_currentHdr));
          reqHdr.SetTidInfo (tid);
          reqHdr.SetHtImmediateAck(true);
          Ptr<Packet> bar = Create<Packet> ();
          bar->AddHeader (reqHdr);
          Bar request (bar, m_currentHdr.GetAddr1 (), tid, reqHdr.MustSendHtImmediateAck());
          m_currentBar = request;
          WifiMacHeader hdr;
          hdr.SetType (WIFI_MAC_CTL_BACKREQ);
          hdr.SetAddr1 (request.recipient);
          hdr.SetAddr2 (m_low->GetAddress ());
          hdr.SetAddr3 (m_low->GetBssid ());
          hdr.SetDsNotTo ();
          hdr.SetDsNotFrom ();
          hdr.SetNoRetry ();
          hdr.SetNoMoreFragments ();
          m_currentPacket = request.bar;
          m_currentHdr = hdr;
        }
      else
        {
          m_currentPacket = 0;
        }
      // to reset the dcf.
      m_currentPacket = 0;
      m_dcf->ResetCw ();
    }
  else

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

Lines 1976-1981	Link Here

1976

  NS_ASSERT (m_currentPacket != 0);

1976

  NS_ASSERT (m_currentPacket != 0);

1977

  WifiTxVector dataTxVector = GetDataTxVector (m_currentPacket, &m_currentHdr);

1977

  WifiTxVector dataTxVector = GetDataTxVector (m_currentPacket, &m_currentHdr);

1978

1979

  if (m_aggregateQueue->GetSize () != 0)

1980

1981

    for(int i = 0; i < m_txPackets.size(); i++)

1982

1983

      uint8_t tid = GetTid (m_txPackets.at(i).packet, m_txPackets.at(i).hdr);

1984

      AcIndex ac = QosUtilsMapTidToAc (tid);

1985

      std::map<AcIndex, MacLowBlockAckEventListener*>::const_iterator listenerIt= m_edcaListeners.find(ac);

1986

1987

      listenerIt->second->CompleteMpduTx (m_txPackets.at(i).packet, m_txPackets.at(i).hdr, m_txPackets.at(i).timestamp);

1988

1989

    m_txPackets.clear ();

1990

1991

1979

  WifiPreamble preamble;

1992

  WifiPreamble preamble;

1980

  if (m_phy->GetGreenfield() && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))

1993

  if (m_phy->GetGreenfield() && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))

1981

     //In the future has to make sure that receiver has greenfield enabled

1994

     //In the future has to make sure that receiver has greenfield enabled

Lines 2719-2731	Link Here

2719

                      m_aggregateQueue->Enqueue (aggPacket, peekedHdr);

2732

                      m_aggregateQueue->Enqueue (aggPacket, peekedHdr);

2720

                      if (i == 1 && hdr.IsQosData ())

2733

                      if (i == 1 && hdr.IsQosData ())

2721

2734

2735

                        if (!m_txParams.MustSendRts ())

2736

2722

                          listenerIt->second->CompleteMpduTx (packet, hdr, tstamp);

2737

                          listenerIt->second->CompleteMpduTx (packet, hdr, tstamp);

2738

2739

                        else

2740

2741

                          InsertInTxQueue (packet, hdr, tstamp);

2742

2723

2743

2724

                      NS_LOG_DEBUG ("Adding packet with Sequence number " << peekedHdr.GetSequenceNumber()<<" to A-MPDU");

2744

                      NS_LOG_DEBUG ("Adding packet with Sequence number " << peekedHdr.GetSequenceNumber()<<" to A-MPDU");

2725

                      i++;

2745

                      i++;

2726

                      isAmpdu = true;

2746

                      isAmpdu = true;

2727

                      m_sentMpdus++;

2747

                      m_sentMpdus++;

2728

                      listenerIt->second->CompleteMpduTx (peekedPacket, peekedHdr, tstamp);

2748

                      if (!m_txParams.MustSendRts ())

2749

2750

                        listenerIt->second->CompleteMpduTx (peekedPacket, peekedHdr, tstamp);

2751

2752

                      else

2753

2754

                        InsertInTxQueue (peekedPacket, peekedHdr, tstamp);

2755

2729

                      if (retry)

2756

                      if (retry)

2730

                          listenerIt->second->RemoveFromBaQueue(tid, hdr.GetAddr1 (), peekedHdr.GetSequenceNumber ());

2757

                          listenerIt->second->RemoveFromBaQueue(tid, hdr.GetAddr1 (), peekedHdr.GetSequenceNumber ());

2731

                      else

2758

                      else

Lines 2811-2816	Link Here

2811

2838

2812

  NS_LOG_DEBUG("Flush aggregate queue");

2839

  NS_LOG_DEBUG("Flush aggregate queue");

2813

  m_aggregateQueue->Flush ();

2840

  m_aggregateQueue->Flush ();

2841

  m_txPackets.clear ();

2842

2843

2844

void

2845

MacLow::InsertInTxQueue (Ptr<const Packet> packet, const WifiMacHeader &hdr, Time tStamp)

2846

2847

  Item item;

2848

2849

  item.packet = packet;

2850

  item.hdr = hdr;

2851

  item.timestamp = tStamp;

2852

2853

  m_txPackets.push_back (item);

2814

2854

2815

2855

2816

} // namespace ns3

2856

} // namespace ns3

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

Lines 1242-1251	Link Here

1242

1243

*/

1243

*/

1244

  bool IsAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr);

1244

  bool IsAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr);

1245

/**

1246

   * Insert in a temporary queue.

1247

   * It is only used with a RTS/CTS exchange for an A-MPDU transmission.

1248

*/

1249

  void InsertInTxQueue (Ptr<const Packet> packet, const WifiMacHeader &hdr, Time tStamp);

1245

1250

1246

  Ptr<WifiPhy> m_phy; //!< Pointer to WifiPhy (actually send/receives frames)

1251

  Ptr<WifiPhy> m_phy; //!< Pointer to WifiPhy (actually send/receives frames)

1247

  Ptr<WifiRemoteStationManager> m_stationManager; //!< Pointer to WifiRemoteStationManager (rate control)

1252

  Ptr<WifiRemoteStationManager> m_stationManager; //!< Pointer to WifiRemoteStationManager (rate control)

1248

  MacLowRxCallback m_rxCallback; //!< Callback to pass packet up

1253

  MacLowRxCallback m_rxCallback; //!< Callback to pass packet up

1254

1255

/**

1256

   * A struct for packet, Wifi header, and timestamp.

1257

*/

1258

  typedef struct

1259

1260

    Ptr<const Packet> packet;

1261

    WifiMacHeader hdr;

1262

    Time timestamp;

1263

  } Item;

1264

1249

/**

1265

/**

1250

   * typedef for an iterator for a list of MacLowDcfListener.

1266

   * typedef for an iterator for a list of MacLowDcfListener.

1251

*/

1267

*/

Lines 1320-1325	Link Here

1320

  Ptr<WifiMacQueue> m_aggregateQueue; //!< Queue used for MPDU aggregation

1336

  Ptr<WifiMacQueue> m_aggregateQueue; //!< Queue used for MPDU aggregation

1321

  WifiMode m_currentMode;             //!< mode used for the current packet transmission

1337

  WifiMode m_currentMode;             //!< mode used for the current packet transmission

1322

  bool m_receivedAtLeastOneMpdu;      //!< Flag whether an MPDU has already been successfully received while receiving an A-MPDU

1338

  bool m_receivedAtLeastOneMpdu;      //!< Flag whether an MPDU has already been successfully received while receiving an A-MPDU

1339

  std::vector<Item> m_txPackets;      //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases.

1323

};

1340

};

1324

1341

1325

} // namespace ns3

1342

} // namespace ns3

Return to bug 2075