Index: src/internet/model/icmpv6-l4-protocol.cc |
=================================================================== |
--- a/src/internet/model/icmpv6-l4-protocol.cc |
+++ b/src/internet/model/icmpv6-l4-protocol.cc |
@@ -203,8 +203,9 @@ |
NdiscCache::Ipv6PayloadHeaderPair p = ForgeNS ("::",Ipv6Address::MakeSolicitedAddress (target), target, interface->GetDevice ()->GetAddress ()); |
/* update last packet UID */ |
- interface->SetNsDadUid (target, p.first->GetUid ()); |
- Simulator::Schedule (Time (MilliSeconds (m_solicitationJitter->GetValue ())), &Ipv6Interface::Send, interface, p.first, p.second, Ipv6Address::MakeSolicitedAddress (target)); |
+ interface->SetNsDadUid (target, static_cast<uint32_t> (p.first->GetUid ())); |
+ Simulator::Schedule (Time (MilliSeconds (static_cast<uint64_t> (m_solicitationJitter->GetValue ()))), |
+ &Ipv6Interface::Send, interface, p.first, p.second, Ipv6Address::MakeSolicitedAddress (target)); |
} |
enum IpL4Protocol::RxStatus Icmpv6L4Protocol::Receive (Ptr<Packet> packet, Ipv4Header const &header, Ptr<Ipv4Interface> interface) |
@@ -1015,7 +1016,8 @@ |
else |
{ |
NS_LOG_LOGIC ("Destination is Multicast, using DelayedSendMessage"); |
- Simulator::Schedule (Time (MilliSeconds (m_solicitationJitter->GetValue ())), &Icmpv6L4Protocol::DelayedSendMessage, this, p, src, dst, 255); |
+ Simulator::Schedule (Time (MilliSeconds (static_cast<uint64_t> (m_solicitationJitter->GetValue ()))), |
+ &Icmpv6L4Protocol::DelayedSendMessage, this, p, src, dst, static_cast<uint8_t> (255)); |
} |
} |
@@ -1043,7 +1045,7 @@ |
else |
{ |
NS_LOG_LOGIC ("Destination is Multicast, using DelayedSendMessage"); |
- Simulator::Schedule (Time (MilliSeconds (m_solicitationJitter->GetValue ())), &Icmpv6L4Protocol::DelayedSendMessage, this, p, src, dst, 255); |
+ Simulator::Schedule (Time (MilliSeconds (static_cast<uint64_t> (m_solicitationJitter->GetValue ()))), &Icmpv6L4Protocol::DelayedSendMessage, this, p, src, dst, (uint8_t)255); |
} |
} |
@@ -1370,7 +1372,7 @@ |
* add it to the cache and send an NS |
*/ |
Ipv6Address addr; |
- NdiscCache::Entry* entry = cache->Add (dst); |
+ entry = cache->Add (dst); |
entry->MarkIncomplete (NdiscCache::Ipv6PayloadHeaderPair (p, ipHeader)); |
entry->SetRouter (false); |