From 0459737b0024692bc948859a1d79388ac261fbed Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Mon, 4 Jun 2007 17:40:09 +0200 Subject: [PATCH] IIpv4Impl -> Ipv4Impl --- src/internet-node/arp-ipv4-interface.cc | 2 +- src/internet-node/arp-private.cc | 12 +++---- src/internet-node/arp-private.h | 12 +++---- src/internet-node/internet-node.cc | 4 +-- src/internet-node/ipv4-impl.cc | 44 ++++++++++++------------- src/internet-node/ipv4-impl.h | 12 +++---- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/internet-node/arp-ipv4-interface.cc b/src/internet-node/arp-ipv4-interface.cc index acfcf0dcc..42d6af238 100644 --- a/src/internet-node/arp-ipv4-interface.cc +++ b/src/internet-node/arp-ipv4-interface.cc @@ -58,7 +58,7 @@ ArpIpv4Interface::SendTo (Packet p, Ipv4Address dest) NS_ASSERT (GetDevice () != 0); if (GetDevice ()->NeedsArp ()) { - Ptr arp = m_node->QueryInterface (IArpPrivate::iid); + Ptr arp = m_node->QueryInterface (ArpPrivate::iid); MacAddress hardwareDestination; bool found = arp->Lookup (p, dest, GetDevice (), &hardwareDestination); if (found) diff --git a/src/internet-node/arp-private.cc b/src/internet-node/arp-private.cc index 30c1f8472..10a86b3e3 100644 --- a/src/internet-node/arp-private.cc +++ b/src/internet-node/arp-private.cc @@ -25,20 +25,20 @@ namespace ns3 { -const InterfaceId IArpPrivate::iid = MakeInterfaceId ("IArpPrivate", Object::iid); +const InterfaceId ArpPrivate::iid = MakeInterfaceId ("ArpPrivate", Object::iid); -IArpPrivate::IArpPrivate (Ptr arp) +ArpPrivate::ArpPrivate (Ptr arp) : m_arp (arp) { - SetInterfaceId (IArpPrivate::iid); + SetInterfaceId (ArpPrivate::iid); } -IArpPrivate::~IArpPrivate () +ArpPrivate::~ArpPrivate () { NS_ASSERT (m_arp == 0); } bool -IArpPrivate::Lookup (Packet &p, Ipv4Address destination, +ArpPrivate::Lookup (Packet &p, Ipv4Address destination, Ptr device, MacAddress *hardwareDestination) { @@ -46,7 +46,7 @@ IArpPrivate::Lookup (Packet &p, Ipv4Address destination, } void -IArpPrivate::DoDispose (void) +ArpPrivate::DoDispose (void) { m_arp = 0; Object::DoDispose (); diff --git a/src/internet-node/arp-private.h b/src/internet-node/arp-private.h index 4f1512504..6e238ade0 100644 --- a/src/internet-node/arp-private.h +++ b/src/internet-node/arp-private.h @@ -18,8 +18,8 @@ * * Author: Mathieu Lacage */ -#ifndef I_ARP_PRIVATE_H -#define I_ARP_PRIVATE_H +#ifndef ARP_PRIVATE_H +#define ARP_PRIVATE_H #include "ns3/object.h" #include "ns3/ipv4-address.h" @@ -31,12 +31,12 @@ class MacAddress; class Packet; class ArpL3Protocol; -class IArpPrivate : public Object +class ArpPrivate : public Object { public: static const InterfaceId iid; - IArpPrivate (Ptr arp); - virtual ~IArpPrivate (); + ArpPrivate (Ptr arp); + virtual ~ArpPrivate (); bool Lookup (Packet &p, Ipv4Address destination, Ptr device, MacAddress *hardwareDestination); @@ -48,4 +48,4 @@ private: } // namespace ns3 -#endif /* I_ARP_PRIVATE_H */ +#endif /* ARP_PRIVATE_H */ diff --git a/src/internet-node/internet-node.cc b/src/internet-node/internet-node.cc index e61ee2572..f60060f9f 100644 --- a/src/internet-node/internet-node.cc +++ b/src/internet-node/internet-node.cc @@ -66,8 +66,8 @@ InternetNode::Construct (void) ipv4L4Demux->Insert (udp); Ptr udpImpl = Create (udp); - Ptr arpPrivate = Create (arp); - Ptr ipv4Impl = Create (ipv4); + Ptr arpPrivate = Create (arp); + Ptr ipv4Impl = Create (ipv4); Ptr ipv4Private = Create (ipv4); Object::AddInterface (ipv4Private); diff --git a/src/internet-node/ipv4-impl.cc b/src/internet-node/ipv4-impl.cc index e42683e3f..5a4c62fe5 100644 --- a/src/internet-node/ipv4-impl.cc +++ b/src/internet-node/ipv4-impl.cc @@ -26,34 +26,34 @@ namespace ns3 { -IIpv4Impl::IIpv4Impl (Ptr ipv4) +Ipv4Impl::Ipv4Impl (Ptr ipv4) : m_ipv4 (ipv4) {} -IIpv4Impl::~IIpv4Impl () +Ipv4Impl::~Ipv4Impl () { NS_ASSERT (m_ipv4 == 0); } void -IIpv4Impl::DoDispose (void) +Ipv4Impl::DoDispose (void) { m_ipv4 = 0; } void -IIpv4Impl::AddHostRouteTo (Ipv4Address dest, +Ipv4Impl::AddHostRouteTo (Ipv4Address dest, Ipv4Address nextHop, uint32_t interface) { m_ipv4->AddHostRouteTo (dest, nextHop, interface); } void -IIpv4Impl::AddHostRouteTo (Ipv4Address dest, +Ipv4Impl::AddHostRouteTo (Ipv4Address dest, uint32_t interface) { m_ipv4->AddHostRouteTo (dest, interface); } void -IIpv4Impl::AddNetworkRouteTo (Ipv4Address network, +Ipv4Impl::AddNetworkRouteTo (Ipv4Address network, Ipv4Mask networkMask, Ipv4Address nextHop, uint32_t interface) @@ -61,86 +61,86 @@ IIpv4Impl::AddNetworkRouteTo (Ipv4Address network, m_ipv4->AddNetworkRouteTo (network, networkMask, nextHop, interface); } void -IIpv4Impl::AddNetworkRouteTo (Ipv4Address network, +Ipv4Impl::AddNetworkRouteTo (Ipv4Address network, Ipv4Mask networkMask, uint32_t interface) { m_ipv4->AddNetworkRouteTo (network, networkMask, interface); } void -IIpv4Impl::SetDefaultRoute (Ipv4Address nextHop, +Ipv4Impl::SetDefaultRoute (Ipv4Address nextHop, uint32_t interface) { m_ipv4->SetDefaultRoute (nextHop, interface); } uint32_t -IIpv4Impl::GetNRoutes (void) +Ipv4Impl::GetNRoutes (void) { return m_ipv4->GetNRoutes (); } Ipv4Route * -IIpv4Impl::GetRoute (uint32_t i) +Ipv4Impl::GetRoute (uint32_t i) { return m_ipv4->GetRoute (i); } void -IIpv4Impl::RemoveRoute (uint32_t i) +Ipv4Impl::RemoveRoute (uint32_t i) { return m_ipv4->RemoveRoute (i); } uint32_t -IIpv4Impl::AddInterface (Ptr device) +Ipv4Impl::AddInterface (Ptr device) { return m_ipv4->AddInterface (device); } uint32_t -IIpv4Impl::GetNInterfaces (void) +Ipv4Impl::GetNInterfaces (void) { return m_ipv4->GetNInterfaces (); } Ptr -IIpv4Impl::GetNetDevice (uint32_t i) +Ipv4Impl::GetNetDevice (uint32_t i) { return m_ipv4->GetInterface (i)-> GetDevice (); } void -IIpv4Impl::SetAddress (uint32_t i, Ipv4Address address) +Ipv4Impl::SetAddress (uint32_t i, Ipv4Address address) { m_ipv4->SetAddress (i, address); } void -IIpv4Impl::SetNetworkMask (uint32_t i, Ipv4Mask mask) +Ipv4Impl::SetNetworkMask (uint32_t i, Ipv4Mask mask) { m_ipv4->SetNetworkMask (i, mask); } Ipv4Mask -IIpv4Impl::GetNetworkMask (uint32_t i) const +Ipv4Impl::GetNetworkMask (uint32_t i) const { return m_ipv4->GetNetworkMask (i); } Ipv4Address -IIpv4Impl::GetAddress (uint32_t i) const +Ipv4Impl::GetAddress (uint32_t i) const { return m_ipv4->GetAddress (i); } uint16_t -IIpv4Impl::GetMtu (uint32_t i) const +Ipv4Impl::GetMtu (uint32_t i) const { return m_ipv4->GetMtu (i); } bool -IIpv4Impl::IsUp (uint32_t i) const +Ipv4Impl::IsUp (uint32_t i) const { return m_ipv4->IsUp (i); } void -IIpv4Impl::SetUp (uint32_t i) +Ipv4Impl::SetUp (uint32_t i) { m_ipv4->SetUp (i); } void -IIpv4Impl::SetDown (uint32_t i) +Ipv4Impl::SetDown (uint32_t i) { m_ipv4->SetDown (i); } diff --git a/src/internet-node/ipv4-impl.h b/src/internet-node/ipv4-impl.h index 39126cdfb..709141a60 100644 --- a/src/internet-node/ipv4-impl.h +++ b/src/internet-node/ipv4-impl.h @@ -18,8 +18,8 @@ * * Author: Mathieu Lacage */ -#ifndef I_IPV4_IMPL_H -#define I_IPV4_IMPL_H +#ifndef IPV4_IMPL_H +#define IPV4_IMPL_H #include "ns3/i-ipv4.h" #include "ns3/ptr.h" @@ -28,12 +28,12 @@ namespace ns3 { class Ipv4L3Protocol; -class IIpv4Impl : public IIpv4 +class Ipv4Impl : public IIpv4 { public: - IIpv4Impl (Ptr ipv4); + Ipv4Impl (Ptr ipv4); - virtual ~IIpv4Impl (); + virtual ~Ipv4Impl (); virtual void AddHostRouteTo (Ipv4Address dest, Ipv4Address nextHop, @@ -72,4 +72,4 @@ private: } // namespace ns3 -#endif /* I_IPV4_IMPL_H */ +#endif /* IPV4_IMPL_H */