Index: src/internet/model/rip.cc |
=================================================================== |
--- a/src/internet/model/rip.cc |
+++ b/src/internet/model/rip.cc |
@@ -173,7 +173,7 @@ |
if (addedGlobal) |
{ |
- Time delay = Seconds (m_rng->GetValue (m_minTriggeredUpdateDelay.GetSeconds (), m_maxTriggeredUpdateDelay.GetSeconds ())); |
+ delay = Seconds (m_rng->GetValue (m_minTriggeredUpdateDelay.GetSeconds (), m_maxTriggeredUpdateDelay.GetSeconds ())); |
m_nextTriggeredUpdate = Simulator::Schedule (delay, &Rip::DoSendRouteUpdate, this, false); |
} |
@@ -795,7 +795,7 @@ |
NS_ASSERT_MSG (sendingSocket, "HandleRequest - Impossible to find a socket to send the reply"); |
uint16_t mtu = m_ipv4->GetMtu (incomingInterface); |
- uint16_t maxRte = (mtu - Ipv4Header ().GetSerializedSize () - UdpHeader ().GetSerializedSize () - RipHeader ().GetSerializedSize ()) / RipRte ().GetSerializedSize (); |
+ uint16_t maxRte = static_cast<uint16_t> ((mtu - Ipv4Header ().GetSerializedSize () - UdpHeader ().GetSerializedSize () - RipHeader ().GetSerializedSize ()) / RipRte ().GetSerializedSize ()); |
Ptr<Packet> p = Create<Packet> (); |
SocketIpTtlTag tag; |
@@ -968,7 +968,7 @@ |
{ |
interfaceMetric = m_interfaceMetrics[incomingInterface]; |
} |
- uint64_t rteMetric = iter->GetRouteMetric () + interfaceMetric; |
+ uint32_t rteMetric = iter->GetRouteMetric () + interfaceMetric; |
if (rteMetric > m_linkDown) |
{ |
rteMetric = m_linkDown; |
@@ -1074,7 +1074,7 @@ |
if (m_interfaceExclusions.find (interface) == m_interfaceExclusions.end ()) |
{ |
uint16_t mtu = m_ipv4->GetMtu (interface); |
- uint16_t maxRte = (mtu - Ipv4Header ().GetSerializedSize () - UdpHeader ().GetSerializedSize () - RipHeader ().GetSerializedSize ()) / RipRte ().GetSerializedSize (); |
+ uint16_t maxRte = static_cast<uint16_t> ((mtu - Ipv4Header ().GetSerializedSize () - UdpHeader ().GetSerializedSize () - RipHeader ().GetSerializedSize ()) / RipRte ().GetSerializedSize ()); |
Ptr<Packet> p = Create<Packet> (); |
SocketIpTtlTag tag; |
@@ -1314,7 +1314,7 @@ |
return m_tag; |
} |
-void RipRoutingTableEntry::SetRouteMetric (uint8_t routeMetric) |
+void RipRoutingTableEntry::SetRouteMetric (uint32_t routeMetric) |
{ |
if (m_metric != routeMetric) |
{ |
@@ -1323,7 +1323,7 @@ |
} |
} |
-uint8_t RipRoutingTableEntry::GetRouteMetric () const |
+uint32_t RipRoutingTableEntry::GetRouteMetric () const |
{ |
return m_metric; |
} |