Bug 1761 - Rounding with olsr::EmfToSeconds

RELEASE_NOTES

@@ -32,15 +32,16 @@ previous releases. 3) TCP Hybla and TCP HighSpeed have been added.
 Bugs fixed
 ----------
 - Bug 1132 - useless for loops in block-ack-test-suite.cc
+- Bug 1571 - TCP zero-window and flow control window updates by the receiver
+- Bug 1761 - Rounding with olsr::EmfToSeconds
 - Bug 1954 - Serialized size of wifi-net-device differ for TX and RX trace
 - Bug 2003 - Missing DSSS short PLCP preamble
-- Bug 2183 - LiIonEnergySourceHelper is not in the energy wscript
-- Bug 2195 - Udp[*]Client can't send packets to broadcast address
-- Bug 1571 - TCP zero-window and flow control window updates by the receiver
 - Bug 2041 - TCP RTO needs unit tests
 - Bug 2150 - The TCP sender keeps retransmitting and does not terminate the connection after some retries.
 - Bug 2159 - TCP advertises wrong receive window
+- Bug 2183 - LiIonEnergySourceHelper is not in the energy wscript
 - Bug 2185 - WiFi MacLow may respond to errored frames that it should ignore
+- Bug 2195 - Udp[*]Client can't send packets to broadcast address
 
 Known issues
 ------------

src/olsr/model/olsr-header.cc

@@ -61,7 +61,7 @@ SecondsToEmf (double seconds)
   double tmp = 16*(seconds/(OLSR_C*(1<<b))-1);
 
   // round it up.  This results in the value for 'a'
-  a = (int) std::ceil (tmp);
+  a = (int) std::ceil (tmp-0.5);
 
   // if 'a' is equal to 16: increment 'b' by one, and set 'a' to 0
   if (a == 16)