Attachment #2316 for bug #2318

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




MacLow::ResetPhy (void)
{
  m_phy->SetReceiveOkCallback (MakeNullCallback<void, Ptr<Packet>, double, WifiTxVector, enum WifiPreamble> ());
  m_phy->SetReceiveErrorCallback (MakeNullCallback<void, Ptr<Packet>, double, bool> ());
  RemovePhyMacLowListener (m_phy);
  m_phy = 0;
}

}

void
MacLow::ReceiveError (Ptr<Packet> packet, double rxSnr, bool isEndOfFrame)
{
  NS_LOG_FUNCTION (this << packet << rxSnr << isEndOfFrame);
  NS_LOG_DEBUG ("rx failed ");
  if (isEndOfFrame == true && m_receivedAtLeastOneMpdu == true)
    {
      WifiMacHeader hdr;
      MpduAggregator::DeaggregatedMpdus mpdu = MpduAggregator::Deaggregate (packet);
      mpdu.begin ()->first->PeekHeader (hdr);
      if (hdr.GetAddr1 () != m_self)
        {
          NS_LOG_DEBUG ("hdr addr1 " << hdr.GetAddr1 () << "not for me (" << m_self << "); returning");

                ", mode=" << txVector.GetMode  () <<
                ", duration=" << hdr->GetDuration () <<
                ", seq=0x" << std::hex << m_currentHdr.GetSequenceControl () << std::dec);
  NS_LOG_DEBUG ("m_ampdu=" << m_ampdu);
  if (!m_ampdu || hdr->IsRts () || hdr->IsBlockAck ())
    {
      m_phy->SendPacket (packet, txVector, preamble);
    }


          listenerIt->second->GetMpduAggregator ()->AddHeaderAndPad (newPacket, last, vhtSingleMpdu);

//          if (hdr->IsBlockAckReq ())
//            {
//              ampdutag.SetNoOfMpdus (queueSize - 1);
//            }
//          else
//            {
              ampdutag.SetNoOfMpdus (queueSize);
//            }
          newPacket->AddPacketTag (ampdutag);
          
          if (delay == Seconds (0))

bool
MacLow::StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const
{
  NS_LOG_FUNCTION (this << size);
  WifiPreamble preamble;
  WifiTxVector dataTxVector = GetDataTxVector (m_currentPacket, &m_currentHdr);


MacLow::AggregateToAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr)
{
  NS_ASSERT (m_aggregateQueue->GetSize () == 0);
  NS_LOG_FUNCTION (this << packet << hdr);
  bool isAmpdu = false;
  Ptr<Packet> newPacket, tempPacket;
  WifiMacHeader peekedHdr;

      std::map<AcIndex, MacLowAggregationCapableTransmissionListener*>::const_iterator listenerIt = m_edcaListeners.find (ac);
      NS_ASSERT (listenerIt != m_edcaListeners.end ());
      queue = listenerIt->second->GetQueue ();
      NS_LOG_DEBUG ("Before-QueueSize=" << queue->GetNPacketsByTidAndAddress (tid, WifiMacHeader::ADDR1, hdr.GetAddr1 ()));

      if (!hdr.GetAddr1 ().IsBroadcast ()
          && (listenerIt->second->GetMpduAggregator () != 0)
          && (queue->GetNPacketsByTidAndAddress (tid, WifiMacHeader::ADDR1, hdr.GetAddr1 ()) != 0))
        {
          //Have to make sure that their exist a block Ack agreement before sending an AMPDU (BlockAck Manager)
          if (listenerIt->second->GetBlockAckAgreementExists (hdr.GetAddr1 (), tid))

              Ptr<const Packet> peekedPacket = listenerIt->second->PeekNextPacketInBaQueue (peekedHdr, peekedHdr.GetAddr1 (), tid, &tstamp);
              if (peekedPacket == 0)
                {
                  NS_LOG_DEBUG ("PeekedPacket=0");
                  peekedPacket = queue->PeekByTidAndAddress (&peekedHdr, tid,
                                                             WifiMacHeader::ADDR1,
                                                             hdr.GetAddr1 (), &tstamp);

                }
              else
                {
                  NS_LOG_DEBUG ("PeekedPacket!=0");
                  retry = true;
                  currentSequenceNumber = peekedHdr.GetSequenceNumber ();
                }

//              NS_LOG_DEBUG ("After-QueueSize=" << queue->GetNPacketsByTidAndAddress (tid, WifiMacHeader::ADDR1, hdr.GetAddr1 ()));

              while (IsInWindow (currentSequenceNumber, startingSequenceNumber, 64) && !StopMpduAggregation (peekedPacket, peekedHdr, currentAggregatedPacket, blockAckSize))
                {
                  //for now always send AMPDU with normal ACK

Ptr<Packet>
MacLow::PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint16_t blockAckSize)
{
  NS_LOG_FUNCTION (this << packet << hdr << *tstamp << currentAmpduPacket << blockAckSize);
  bool msduAggregation = false;
  bool isAmsdu = false;
  Ptr<Packet> currentAmsduPacket = Create<Packet> ();

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

Lines 732-738 public:	Link Here

732

   * This method is typically invoked by the lower PHY layer to notify

732

   * This method is typically invoked by the lower PHY layer to notify

733

   * the MAC layer that a packet was unsuccessfully received.

733

   * the MAC layer that a packet was unsuccessfully received.

734

*/

734

*/

735

  void ReceiveError (Ptr<const Packet> packet, double rxSnr, bool isEndOfFrame);

735

  void ReceiveError (Ptr<Packet> packet, double rxSnr, bool isEndOfFrame);

736

/**

736

/**

737

   * \param duration switching delay duration.

737

   * \param duration switching delay duration.

738

(-)Downloads/original/src/wifi/model/wifi-phy.h (-1 / +1 lines)

Lines 194-200 public:	Link Here

194

   * arg2: snr of packet

194

   * arg2: snr of packet

195

   * arg3: PHY-RXEND flag

195

   * arg3: PHY-RXEND flag

196

*/

196

*/

197

  typedef Callback<void, Ptr<const Packet>, double, bool> RxErrorCallback;

197

  typedef Callback<void, Ptr<Packet>, double, bool> RxErrorCallback;

198

199

  static TypeId GetTypeId (void);

199

  static TypeId GetTypeId (void);

200

(-)Downloads/original/src/wifi/model/wifi-phy-state-helper.cc (-1 / +1 lines)

Lines 442-448 WifiPhyStateHelper::SwitchFromRxEndOk (P	Link Here

442

443

444

void

444

void

445

WifiPhyStateHelper::SwitchFromRxEndError (Ptr<const Packet> packet, double snr, bool isEndOfFrame)

445

WifiPhyStateHelper::SwitchFromRxEndError (Ptr<Packet> packet, double snr, bool isEndOfFrame)

446

447

  m_rxErrorTrace (packet, snr);

447

  m_rxErrorTrace (packet, snr);

448

  NotifyRxEndError ();

448

  NotifyRxEndError ();

(-)Downloads/original/src/wifi/model/wifi-phy-state-helper.h (-1 / +1 lines)

Lines 169-175 public:	Link Here

169

   * \param snr the SNR of the received packet

169

   * \param snr the SNR of the received packet

170

   * \param isEndOfFrame PHY-RXEND indication.

170

   * \param isEndOfFrame PHY-RXEND indication.

171

*/

171

*/

172

  void SwitchFromRxEndError (Ptr<const Packet> packet, double snr, bool isEndOfFrame);

172

  void SwitchFromRxEndError (Ptr<Packet> packet, double snr, bool isEndOfFrame);

173

/**

173

/**

174

   * Switch to CCA busy.

174

   * Switch to CCA busy.

175

Return to bug 2318