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

(-)a/src/lr-wpan/model/lr-wpan-phy.cc (-2 / +6 lines)
 Lines 415-427    Link Here 
415
      m_edPower.lastUpdate = now;
415
      m_edPower.lastUpdate = now;
416
    }
416
    }
417
417
418
  CheckInterference ();
418
  Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
419
420
  if (currentRxParams == params)
421
    {
422
      CheckInterference ();
423
    }
419
424
420
  // Update the interference.
425
  // Update the interference.
421
  m_signal->RemoveSignal (params->psd);
426
  m_signal->RemoveSignal (params->psd);
422
427
423
  // If this is the end of the currently received packet, check if reception was successfull.
428
  // If this is the end of the currently received packet, check if reception was successfull.
424
  Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
425
  if (currentRxParams == params)
429
  if (currentRxParams == params)
426
    {
430
    {
427
      Ptr<Packet> currentPacket = currentRxParams->packetBurst->GetPackets ().front ();
431
      Ptr<Packet> currentPacket = currentRxParams->packetBurst->GetPackets ().front ();
(-)a/src/lr-wpan/test/lr-wpan-collision-test.cc (-1 / +1 lines)
 Lines 189-195    Link Here 
189
  Simulator::Run ();
189
  Simulator::Run ();
190
190
191
  std::cout << "m_rxPackets = " << int(m_rxPackets) << std::endl;
191
  std::cout << "m_rxPackets = " << int(m_rxPackets) << std::endl;
192
  NS_TEST_EXPECT_MSG_EQ (m_rxPackets, 0, "Received a packet (as expected)");
192
  NS_TEST_EXPECT_MSG_EQ (m_rxPackets, 1, "Received a packet (as expected)");
193
193
194
  // Fourth case: two concurrent tx and ACKs
194
  // Fourth case: two concurrent tx and ACKs
195
  std::cout << "*** Fourth test " << std::endl;
195
  std::cout << "*** Fourth test " << std::endl;

Return to bug 2008