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

Bug 2008 - [lr-wpan] crash if ending rx while status change is in progress

Browse Source
This commit is contained in:
Tommaso Pecorella
2015-05-02 22:17:35 +02:00
parent ed20015f6d
commit 4e5366f09f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lr-wpan/model/lr-wpan-phy.cc
View File

@@ -285,7 +285,7 @@ LrWpanPhy::StartRx (Ptr<SpectrumSignalParameters> spectrumRxParams)
Ptr<LrWpanSpectrumSignalParameters> lrWpanRxParams = DynamicCast<LrWpanSpectrumSignalParameters> (spectrumRxParams);
if ( lrWpanRxParams == 0)
if (lrWpanRxParams == 0)
{
CheckInterference ();
m_signal->AddSignal (spectrumRxParams->psd);
@@ -450,7 +450,11 @@ LrWpanPhy::EndRx (Ptr<SpectrumSignalParameters> par)
m_edPower.lastUpdate = now;
}
CheckInterference ();
Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
if (currentRxParams == params)
{
CheckInterference ();
}
// Update the interference.
m_signal->RemoveSignal (par->psd);
@@ -462,7 +466,6 @@ LrWpanPhy::EndRx (Ptr<SpectrumSignalParameters> par)
}
// If this is the end of the currently received packet, check if reception was successful.
Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
if (currentRxParams == params)
{
Ptr<Packet> currentPacket = currentRxParams->packetBurst->GetPackets ().front ();

2
src/lr-wpan/test/lr-wpan-collision-test.cc
View File

@@ -189,7 +189,7 @@ LrWpanCollisionTestCase::DoRun (void)
Simulator::Run ();
std::cout << "m_rxPackets = " << int(m_rxPackets) << std::endl;
NS_TEST_EXPECT_MSG_EQ (m_rxPackets, 0, "Received a packet (as expected)");
NS_TEST_EXPECT_MSG_EQ (m_rxPackets, 1, "Received a packet (as expected)");
// Fourth case: two concurrent tx and ACKs
std::cout << "*** Fourth test " << std::endl;