From 42ab2d58cb83d10444a93a50f3cc33a2ecc2d444 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Tue, 24 Nov 2009 12:06:19 +0100 Subject: [PATCH 1/2] frmlen field in prism header set to PRISM_STATUS_PRESENT --- src/common/pcap-writer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ()); From 51c535e9c02bb2b0e2cfd6a8c16e1ac266804f1a Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 24 Nov 2009 11:48:06 +0000 Subject: [PATCH 2/2] Bug 739 - OLSR: Strange HTime value in HELLO messages (thanks to Pavel Boyko) --- src/routing/olsr/olsr-routing-protocol.cc | 4 ++-- .../test/olsr-hello-regression-test-0-1.pcap | Bin 452 -> 452 bytes .../test/olsr-hello-regression-test-1-1.pcap | Bin 452 -> 452 bytes 3 files changed, 2 insertions(+), 2 deletions(-) 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 f92c5b0c2a1e3af360ff0928fe7662e420cc200a..d1218b1f8820dee1cece917af67034bdba60a501 100644 GIT binary patch delta 44 tcmX@Ye1v&I1S9LjNJk(s8${goWMrMJ&Ilq489ljJnb{Z^IJg)Y837Sv31a{N delta 44 tcmX@Ye1v&I1Y_I8NJk(s8${goWNe$P&Ilq489lk$nAsQ@IJg)Y839@I3~2xW 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 8046745099734887d36e4ca91c50870f167eb19e..39ee00cc8a033f467a711adc9f18c3c47311f35c 100644 GIT binary patch delta 44 tcmX@Ye1v&I1S9LjNJk(s8${goWMrMJ&Ilq489ljJnb{Z^IJg)Y837Sv31a{N delta 44 tcmX@Ye1v&I1Y_I8NJk(s8${goWNe$P&Ilq489lk$nAsQ@IJg)Y839@I3~2xW