Index: src/internet/model/ipv4-l3-protocol.cc |
=================================================================== |
--- a/src/internet/model/ipv4-l3-protocol.cc |
+++ b/src/internet/model/ipv4-l3-protocol.cc |
@@ -36,7 +36,6 @@ |
#include "loopback-net-device.h" |
#include "arp-l3-protocol.h" |
#include "ipv4-l3-protocol.h" |
-#include "ipv4-l4-protocol.h" |
#include "icmpv4-l4-protocol.h" |
#include "ipv4-interface.h" |
#include "ipv4-raw-socket-impl.h" |
@@ -98,11 +97,11 @@ |
} |
void |
-Ipv4L3Protocol::Insert (Ptr<Ipv4L4Protocol> protocol) |
+Ipv4L3Protocol::Insert (Ptr<IpL4Protocol> protocol) |
{ |
m_protocols.push_back (protocol); |
} |
-Ptr<Ipv4L4Protocol> |
+Ptr<IpL4Protocol> |
Ipv4L3Protocol::GetProtocol (int protocolNumber) const |
{ |
for (L4List_t::const_iterator i = m_protocols.begin (); i != m_protocols.end (); ++i) |
@@ -115,7 +114,7 @@ |
return 0; |
} |
void |
-Ipv4L3Protocol::Remove (Ptr<Ipv4L4Protocol> protocol) |
+Ipv4L3Protocol::Remove (Ptr<IpL4Protocol> protocol) |
{ |
m_protocols.remove (protocol); |
} |
@@ -512,7 +511,7 @@ |
Ptr<Icmpv4L4Protocol> |
Ipv4L3Protocol::GetIcmp (void) const |
{ |
- Ptr<Ipv4L4Protocol> prot = GetProtocol (Icmpv4L4Protocol::GetStaticProtocolNumber ()); |
+ Ptr<IpL4Protocol> prot = GetProtocol (Icmpv4L4Protocol::GetStaticProtocolNumber ()); |
if (prot != 0) |
{ |
return prot->GetObject<Icmpv4L4Protocol> (); |
@@ -863,22 +862,22 @@ |
m_localDeliverTrace (ip, packet, iif); |
- Ptr<Ipv4L4Protocol> protocol = GetProtocol (ip.GetProtocol ()); |
+ Ptr<IpL4Protocol> protocol = GetProtocol (ip.GetProtocol ()); |
if (protocol != 0) |
{ |
// we need to make a copy in the unlikely event we hit the |
// RX_ENDPOINT_UNREACH codepath |
Ptr<Packet> copy = p->Copy (); |
- enum Ipv4L4Protocol::RxStatus status = |
+ enum IpL4Protocol::RxStatus status = |
protocol->Receive (p, ip, GetInterface (iif)); |
switch (status) { |
- case Ipv4L4Protocol::RX_OK: |
+ case IpL4Protocol::RX_OK: |
// fall through |
- case Ipv4L4Protocol::RX_ENDPOINT_CLOSED: |
+ case IpL4Protocol::RX_ENDPOINT_CLOSED: |
// fall through |
- case Ipv4L4Protocol::RX_CSUM_FAILED: |
+ case IpL4Protocol::RX_CSUM_FAILED: |
break; |
- case Ipv4L4Protocol::RX_ENDPOINT_UNREACH: |
+ case IpL4Protocol::RX_ENDPOINT_UNREACH: |
if (ip.GetDestination ().IsBroadcast () == true || |
ip.GetDestination ().IsMulticast () == true) |
{ |