diff --git a/src/common/pcap-writer.cc b/src/common/pcap-writer.cc index c69cb223e..c56d463f1 100644 --- a/src/common/pcap-writer.cc +++ b/src/common/pcap-writer.cc @@ -333,7 +333,7 @@ void PcapWriter::WriteWifiMonitorPacket(Ptr packet, uint16_t chann Write32(isTx ? 1 : 0); Write32(PRISM_DID_FRMLEN); - Write16(PRISM_STATUS_ABSENT); + Write16(PRISM_STATUS_PRESENT); Write16(PRISM_ITEM_LENGTH); Write32(packet->GetSize ()); diff --git a/src/routing/olsr/olsr-routing-protocol.cc b/src/routing/olsr/olsr-routing-protocol.cc index 344ee119c..4963cc452 100644 --- a/src/routing/olsr/olsr-routing-protocol.cc +++ b/src/routing/olsr/olsr-routing-protocol.cc @@ -72,7 +72,7 @@ /********** Holding times **********/ /// Neighbor holding time. -#define OLSR_NEIGHB_HOLD_TIME (Scalar (3) * OLSR_REFRESH_INTERVAL) +#define OLSR_NEIGHB_HOLD_TIME (Scalar (3) * m_helloInterval) /// Top holding time. #define OLSR_TOP_HOLD_TIME (Scalar (3) * m_tcInterval) /// Dup holding time. @@ -1458,7 +1458,7 @@ RoutingProtocol::SendHello () msg.SetMessageSequenceNumber (GetMessageSequenceNumber ()); olsr::MessageHeader::Hello &hello = msg.GetHello (); - hello.SetHTime (Scalar (3) * m_helloInterval); + hello.SetHTime (m_helloInterval); hello.willingness = m_willingness; std::vector diff --git a/src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap b/src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap index f92c5b0c2..d1218b1f8 100644 Binary files a/src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap and b/src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap differ diff --git a/src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap b/src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap index 804674509..39ee00cc8 100644 Binary files a/src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap and b/src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap differ