F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure that m_listener is not reset to zero _after_ calling a user-provided callback. This allows the user-provided callback to set the m_listener member to a new value if it wants to start a new transmission

Browse Source
This commit is contained in:
Mathieu Lacage
2007-11-08 15:22:22 +01:00
parent dbdd00fef8
commit fc57cac746
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/devices/wifi/mac-low.cc
View File

@@ -23,6 +23,7 @@
#include "ns3/simulator.h"
#include "ns3/tag.h"
#include "ns3/log.h"
#include "ns3/node.h"
#include "mac-low.h"
#include "wifi-phy.h"
@@ -34,7 +35,7 @@
NS_LOG_COMPONENT_DEFINE ("MacLow");
#define MY_DEBUG(x) \
NS_LOG_DEBUG (Simulator::Now () << " " << x)
NS_LOG_DEBUG (Simulator::Now () << " " << m_device->GetNode ()->GetId () << " " << x)
namespace ns3 {
@@ -364,7 +365,7 @@ MacLow::StartTransmission (Packet packet,
//NS_ASSERT (m_phy->IsStateIdle ());
MY_DEBUG ("startTx size="<< GetCurrentSize () << ", to=" << m_currentHdr.GetAddr1());
MY_DEBUG ("startTx size="<< GetCurrentSize () << ", to=" << m_currentHdr.GetAddr1()<<", listener="<<m_listener);
if (m_txParams.MustSendRts ())
{
@@ -732,45 +733,54 @@ MacLow::CtsTimeout (void)
MacStation *station = GetStation (m_currentHdr.GetAddr1 ());
station->ReportRtsFailed ();
m_hasCurrent = false;
m_listener->MissedCts ();
MacLowTransmissionListener *listener = m_listener;
m_listener = 0;
listener->MissedCts ();
}
void
MacLow::NormalAckTimeout (void)
{
MY_DEBUG ("normal ack timeout");
MacStation *station = GetStation (m_currentHdr.GetAddr1 ());
station->ReportDataFailed ();
m_listener->MissedAck ();
MacLowTransmissionListener *listener = m_listener;
m_listener = 0;
listener->MissedAck ();
}
void
MacLow::FastAckTimeout (void)
{
MacStation *station = GetStation (m_currentHdr.GetAddr1 ());
station->ReportDataFailed ();
MacLowTransmissionListener *listener = m_listener;
m_listener = 0;
if (m_phy->IsStateIdle ())
{
MY_DEBUG ("fast Ack idle missed");
m_listener->MissedAck ();
listener->MissedAck ();
}
else
{
MY_DEBUG ("fast Ack ok");
}
m_listener = 0;
}
void
MacLow::SuperFastAckTimeout ()
{
MacStation *station = GetStation (m_currentHdr.GetAddr1 ());
station->ReportDataFailed ();
MacLowTransmissionListener *listener = m_listener;
m_listener = 0;
if (m_phy->IsStateIdle ())
{
MY_DEBUG ("super fast Ack failed");
m_listener->MissedAck ();
listener->MissedAck ();
}
else
{
MY_DEBUG ("super fast Ack ok");
m_listener->GotAck (0.0, WifiMode ());
listener->GotAck (0.0, WifiMode ());
}
m_listener = 0;
}
void
@@ -974,7 +984,9 @@ MacLow::WaitSifsAfterEndTx (void)
void
MacLow::FastAckFailedTimeout (void)
{
m_listener->MissedAck ();
MacLowTransmissionListener *listener = m_listener;
m_listener = 0;
listener->MissedAck ();
MY_DEBUG ("fast Ack busy but missed");
}