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

MilliSeconds(double) fixed to MilliSeconds(int)

Browse Source
This commit is contained in:
Pavel Boyko
2009-09-30 20:15:41 +04:00
parent 6f8649e209
commit 6950c31244
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/helper/wscript
View File

@@ -25,6 +25,7 @@ def build(bld):
'v4ping-helper.cc',
'nqos-wifi-mac-helper.cc',
'qos-wifi-mac-helper.cc',
'ipv4-nix-vector-helper.cc',
'ipv4-global-routing-helper.cc',
'ipv4-list-routing-helper.cc',
'ipv4-routing-helper.cc',
@@ -67,13 +68,14 @@ def build(bld):
'v4ping-helper.h',
'nqos-wifi-mac-helper.h',
'qos-wifi-mac-helper.h',
'ipv4-global-routing-helper.h',
'ipv4-nix-vector-helper.h',
'ipv4-global-routing-helper.h',
'ipv4-list-routing-helper.h',
'ipv4-routing-helper.h',
'aodv-helper.h',
'mesh-helper.h',
'mesh-stack-installer.h',
'dot11s-intaller.h',
'dot11s-installer.h',
'flame-installer.h',
'athstats-helper.h',
'ipv6-address-helper.h',

10
src/routing/aodv/aodv-routing-protocol.cc
View File

@@ -415,7 +415,7 @@ RoutingProtocol::SetIpv4 (Ptr<Ipv4> ipv4)
if (EnableHello)
{
htimer.SetFunction (&RoutingProtocol::HelloTimerExpire, this);
htimer.Schedule (MilliSeconds (UniformVariable ().GetValue (0.0, 100.0)));
htimer.Schedule (MilliSeconds (UniformVariable ().GetInteger (0, 100)));
}
m_ipv4 = ipv4;
@@ -603,7 +603,7 @@ RoutingProtocol::SendRequest (Ipv4Address dst)
// A node SHOULD NOT originate more than RREQ_RATELIMIT RREQ messages per second.
if (m_rreqCount == RreqRateLimit)
{
Simulator::Schedule (m_rreqRateLimitTimer.GetDelayLeft () + MilliSeconds (0.1),
Simulator::Schedule (m_rreqRateLimitTimer.GetDelayLeft () + MicroSeconds (100),
&RoutingProtocol::SendRequest, this, dst);
return;
}
@@ -663,7 +663,7 @@ RoutingProtocol::SendRequest (Ipv4Address dst)
if (EnableHello)
{
htimer.Cancel ();
htimer.Schedule (HelloInterval - Scalar (0.01) * MilliSeconds (UniformVariable ().GetValue (0, 10)));
htimer.Schedule (HelloInterval - Scalar (0.01) * MilliSeconds (UniformVariable ().GetInteger (0, 10)));
}
}
@@ -888,7 +888,7 @@ RoutingProtocol::RecvRequest (Ptr<Packet> p, Ipv4Address receiver, Ipv4Address s
if (EnableHello)
{
htimer.Cancel ();
htimer.Schedule (HelloInterval - Scalar(0.1)*MilliSeconds(UniformVariable().GetValue (0.0, 10.0)));
htimer.Schedule (HelloInterval - Scalar(0.1)*MilliSeconds(UniformVariable().GetInteger (0, 10)));
}
}
@@ -1252,7 +1252,7 @@ RoutingProtocol::HelloTimerExpire ()
NS_LOG_FUNCTION(this);
SendHello ();
htimer.Cancel ();
Time t = Scalar(0.01)*MilliSeconds(UniformVariable().GetValue (0.0, 100.0));
Time t = Scalar(0.01)*MilliSeconds(UniformVariable().GetInteger (0, 100));
htimer.Schedule (HelloInterval - t);
}