Attachment #2161 for bug #2185

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

(-)a/src/test/traced/traced-callback-typedef-test-suite.cc (-1 / +3 lines)

Lines 609-615	Link Here

609

         const WifiMacHeader &,

609

         const WifiMacHeader &,

610

         empty, empty, empty, empty);

610

         empty, empty, empty, empty);

611

612

  DUPE   (WifiPhyStateHelper::RxEndErrorTracedCallback, Packet::SinrTracedCallback);

612

  CHECK (WifiPhyStateHelper::RxEndErrorTracedCallback,

613

         Ptr<const Packet>, double, bool,

614

         empty, empty);

613

615

614

  CHECK (WifiPhyStateHelper::RxOkTracedCallback,

616

  CHECK (WifiPhyStateHelper::RxOkTracedCallback,

615

         Ptr<const Packet>, double, WifiMode, WifiPreamble,

617

         Ptr<const Packet>, double, WifiMode, WifiPreamble,




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

}

void
MacLow::ReceiveError (Ptr<const Packet> packet, double rxSnr, bool isEndOfFrame)
{
  NS_LOG_FUNCTION (this << packet << rxSnr << isEndOfFrame);
  NS_LOG_DEBUG ("rx failed ");
  if (isEndOfFrame == true && m_receivedAtLeastOneMpdu == true)
  Ptr<Packet> pkt = packet->Copy ();
  bool isInAmpdu = pkt->RemovePacketTag (ampdu);

  if (isInAmpdu && m_receivedAtLeastOneMpdu && (ampdu.GetNoOfMpdus () == 1))
    {
      NS_ASSERT (m_lastReceivedHdr.IsQosData ());
      NS_LOG_DEBUG ("last a-mpdu subframe detected/sendImmediateBlockAck from=" << m_lastReceivedHdr.GetAddr2 ());
      m_sendAckEvent = Simulator::Schedule (GetSifs (),
                                            &MacLow::SendBlockAckAfterAmpdu, this,
                                            m_lastReceivedHdr.GetQosTid (),
                                            m_lastReceivedHdr.GetAddr2 (),
                                            m_lastReceivedHdr.GetDuration (),
                                            m_currentTxVector);
      m_receivedAtLeastOneMpdu = false;
            {
              NS_LOG_DEBUG ("last a-mpdu subframe detected/sendImmediateBlockAck from=" << hdr.GetAddr2 ());
              m_sendAckEvent = Simulator::Schedule (GetSifs (),
                                                    &MacLow::SendBlockAckAfterAmpdu, this,
                                                    hdr.GetQosTid (),
                                                    hdr.GetAddr2 (),
                                                    hdr.GetDuration (),
                                                    m_currentTxVector);
              m_receivedAtLeastOneMpdu = false;
            }
        }
      else if (hdr.IsBlockAckReq ())
        {
          NS_LOG_DEBUG ("last a-mpdu subframe is BAR");
          m_receivedAtLeastOneMpdu = false;
        }
    }
  if (m_txParams.MustWaitFastAck ())
    {
      NS_ASSERT (m_fastAckFailedTimeoutEvent.IsExpired ());
      m_fastAckFailedTimeoutEvent = Simulator::Schedule (GetSifs (),

   */
  WifiMacHeader hdr;
  packet->RemoveHeader (hdr);
  m_lastReceivedHdr = hdr;

  bool isPrevNavZero = IsNavZero ();
  NS_LOG_DEBUG ("duration/id=" << hdr.GetDuration ());




  /**
   * \param packet packet received.
   * \param rxSnr snr of packet received.
   * \param isEndOfFrame PHY-RXEND indication.
   *
   * This method is typically invoked by the lower PHY layer to notify
   * the MAC layer that a packet was unsuccessfully received.
   */
  void ReceiveError (Ptr<const Packet> packet, double rxSnr, bool isEndOfFrame);
  /**
   * \param duration switching delay duration.
   *

  Ptr<MpduAggregator> m_mpduAggregator; //!<

  Ptr<Packet> m_currentPacket;              //!< Current packet transmitted/to be transmitted
  WifiMacHeader m_currentHdr;               //!< Header of the current transmitted packet
  WifiMacHeader m_lastReceivedHdr;          //!< Header of the last received packet
  MacLowTransmissionParameters m_txParams;  //!< Transmission parameters of the current packet
  MacLowTransmissionListener *m_listener;   //!< Transmission listener for the current packet
  Mac48Address m_self;                      //!< Address of this MacLow (Mac48Address)




}

void
WifiPhyStateHelper::SwitchFromRxEndError (Ptr<const Packet> packet, double snr, bool isEndOfFrame)
{
  m_rxErrorTrace (packet, snr);
  NotifyRxEndError ();
  DoSwitchFromRx ();
  if (!m_rxErrorCallback.IsNull ())
    {
      m_rxErrorCallback (packet, snr, isEndOfFrame);
    }
}





   *
   * \param packet the packet that we failed to received
   * \param snr the SNR of the received packet
   * \param isEndOfFrame PHY-RXEND indication.
   */
  void SwitchFromRxEndError (Ptr<const Packet> packet, double snr, bool isEndOfFrame);
  /**
   * Switch to CCA busy.
   *

  /**
   * TracedCallback signature for receive end error event.
   *
   * \param [in] packet       The received packet.
   * \param [in] snr          The SNR of the received packet.
   * \param [in] isEndOfFrame PHY-RXEND indication..
   */
  typedef void (* RxEndErrorTracedCallback)
    (Ptr<const Packet> packet, double snr, bool isEndOfFrame);

  /**
   * TracedCallback signature for transmit event.

(-)a/src/wifi/model/wifi-phy.h (-1 / +2 lines)

Lines 192-199	Link Here

192

/**

192

/**

193

   * arg1: packet received unsuccessfully

193

   * arg1: packet received unsuccessfully

194

   * arg2: snr of packet

194

   * arg2: snr of packet

195

   * arg3: PHY-RXEND flag

195

*/

196

*/

196

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

197

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

197

198

  static TypeId GetTypeId (void);

199

  static TypeId GetTypeId (void);

199

200




        {
          /* failure. */
          NotifyRxDrop (packet);
          bool isEndOfFrame = ((mpdutype == NORMAL_MPDU && preamble != WIFI_PREAMBLE_NONE) || (mpdutype == LAST_MPDU_IN_AGGREGATE && preamble == WIFI_PREAMBLE_NONE));
          m_state->SwitchFromRxEndError (packet, snrPer.snr, isEndOfFrame);
        }
    }
  else
    {
      bool isEndOfFrame = ((mpdutype == NORMAL_MPDU && preamble != WIFI_PREAMBLE_NONE) || (mpdutype == LAST_MPDU_IN_AGGREGATE && preamble == WIFI_PREAMBLE_NONE));
      m_state->SwitchFromRxEndError (packet, snrPer.snr, isEndOfFrame);
    }

  if (preamble == WIFI_PREAMBLE_NONE && mpdutype == LAST_MPDU_IN_AGGREGATE)

Return to bug 2185