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

IIpv4Impl -> Ipv4Impl

Browse Source
This commit is contained in:
Mathieu Lacage
2007-06-04 17:40:09 +02:00
parent 372ecb8430
commit 0459737b00
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internet-node/arp-ipv4-interface.cc
View File

@@ -58,7 +58,7 @@ ArpIpv4Interface::SendTo (Packet p, Ipv4Address dest)
NS_ASSERT (GetDevice () != 0);
if (GetDevice ()->NeedsArp ())
{
Ptr<IArpPrivate> arp = m_node->QueryInterface<IArpPrivate> (IArpPrivate::iid);
Ptr<ArpPrivate> arp = m_node->QueryInterface<ArpPrivate> (ArpPrivate::iid);
MacAddress hardwareDestination;
bool found = arp->Lookup (p, dest, GetDevice (), &hardwareDestination);
if (found)

12
src/internet-node/arp-private.cc
View File

@@ -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<ArpL3Protocol> arp)
ArpPrivate::ArpPrivate (Ptr<ArpL3Protocol> 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<NetDevice> 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 ();

12
src/internet-node/arp-private.h
View File

@@ -18,8 +18,8 @@
*
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
*/
#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<ArpL3Protocol> arp);
virtual ~IArpPrivate ();
ArpPrivate (Ptr<ArpL3Protocol> arp);
virtual ~ArpPrivate ();
bool Lookup (Packet &p, Ipv4Address destination,
Ptr<NetDevice> device,
MacAddress *hardwareDestination);
@@ -48,4 +48,4 @@ private:
} // namespace ns3
#endif /* I_ARP_PRIVATE_H */
#endif /* ARP_PRIVATE_H */

4
src/internet-node/internet-node.cc
View File

@@ -66,8 +66,8 @@ InternetNode::Construct (void)
ipv4L4Demux->Insert (udp);
Ptr<UdpImpl> udpImpl = Create<UdpImpl> (udp);
Ptr<IArpPrivate> arpPrivate = Create<IArpPrivate> (arp);
Ptr<IIpv4Impl> ipv4Impl = Create<IIpv4Impl> (ipv4);
Ptr<ArpPrivate> arpPrivate = Create<ArpPrivate> (arp);
Ptr<Ipv4Impl> ipv4Impl = Create<Ipv4Impl> (ipv4);
Ptr<IIpv4Private> ipv4Private = Create<IIpv4Private> (ipv4);
Object::AddInterface (ipv4Private);

44
src/internet-node/ipv4-impl.cc
View File

@@ -26,34 +26,34 @@
namespace ns3 {
IIpv4Impl::IIpv4Impl (Ptr<Ipv4L3Protocol> ipv4)
Ipv4Impl::Ipv4Impl (Ptr<Ipv4L3Protocol> 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<NetDevice> device)
Ipv4Impl::AddInterface (Ptr<NetDevice> device)
{
return m_ipv4->AddInterface (device);
}
uint32_t
IIpv4Impl::GetNInterfaces (void)
Ipv4Impl::GetNInterfaces (void)
{
return m_ipv4->GetNInterfaces ();
}
Ptr<NetDevice>
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);
}

12
src/internet-node/ipv4-impl.h
View File

@@ -18,8 +18,8 @@
*
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
*/
#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<Ipv4L3Protocol> ipv4);
Ipv4Impl (Ptr<Ipv4L3Protocol> 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 */