Bug 1300: fixed

This commit is contained in:
Kirill Andreev
2011-11-23 19:08:31 +03:00
parent 825c5aad26
commit eabb826db0
3 changed files with 10 additions and 0 deletions

View File

@@ -380,6 +380,7 @@ HalfDuplexIdealPhy::AbortRx ()
NS_LOG_LOGIC (this << "state: " << m_state);
NS_ASSERT (m_state == RX);
m_interference.AbortRx ();
m_phyRxAbortTrace (m_rxPacket);
m_endRxEventId.Cancel ();
m_rxPacket = 0;

View File

@@ -67,6 +67,11 @@ SpectrumInterference::StartRx (Ptr<const Packet> p, Ptr<const SpectrumValue> rxP
m_errorModel->StartRx (p);
}
void
SpectrumInterference::AbortRx ()
{
m_receiving = false;
}
bool
SpectrumInterference::EndRx ()

View File

@@ -64,6 +64,10 @@ public:
*/
void StartRx (Ptr<const Packet> p, Ptr<const SpectrumValue> rxPsd);
/**
* notify that the PHY has aborted RX
*/
void AbortRx ();
/**
* notify that the RX attempt has ended. The receiving PHY must call