--- a/SConstruct Mon Jun 04 17:13:21 2007 +0200
+++ b/SConstruct Mon Jun 04 17:14:59 2007 +0200
@@ -274,7 +274,7 @@
'header-utils.cc',
'udp-socket.cc',
'ipv4-end-point-demux.cc',
- 'i-arp-private.cc',
+ 'arp-private.cc',
'ipv4-impl.cc',
'ipv4-private.cc',
'ascii-trace.cc',
@@ -294,7 +294,7 @@
'arp-ipv4-interface.h',
'udp-socket.h',
'udp.h',
- 'i-arp-private.h',
+ 'arp-private.h',
'ipv4-impl.h',
'ipv4-private.h',
'ipv4-l3-protocol.h',
--- a/src/internet-node/arp-ipv4-interface.cc Mon Jun 04 17:13:21 2007 +0200
+++ b/src/internet-node/arp-ipv4-interface.cc Mon Jun 04 17:14:59 2007 +0200
@@ -26,7 +26,7 @@
#include "ns3/net-device.h"
#include "arp-ipv4-interface.h"
-#include "i-arp-private.h"
+#include "arp-private.h"
#include "ipv4-l3-protocol.h"
namespace ns3 {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/internet-node/arp-private.cc Mon Jun 04 17:14:59 2007 +0200
@@ -0,0 +1,56 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INRIA
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+#include "arp-private.h"
+#include "arp-l3-protocol.h"
+#include "ns3/assert.h"
+#include "ns3/net-device.h"
+
+namespace ns3 {
+
+const InterfaceId IArpPrivate::iid = MakeInterfaceId ("IArpPrivate", Object::iid);
+
+IArpPrivate::IArpPrivate (Ptr<ArpL3Protocol> arp)
+ : m_arp (arp)
+{
+ SetInterfaceId (IArpPrivate::iid);
+}
+IArpPrivate::~IArpPrivate ()
+{
+ NS_ASSERT (m_arp == 0);
+}
+
+bool
+IArpPrivate::Lookup (Packet &p, Ipv4Address destination,
+ Ptr<NetDevice> device,
+ MacAddress *hardwareDestination)
+{
+ return m_arp->Lookup (p, destination, device, hardwareDestination);
+}
+
+void
+IArpPrivate::DoDispose (void)
+{
+ m_arp = 0;
+ Object::DoDispose ();
+}
+
+
+} // namespace ns3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/internet-node/arp-private.h Mon Jun 04 17:14:59 2007 +0200
@@ -0,0 +1,51 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INRIA
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+#ifndef I_ARP_PRIVATE_H
+#define I_ARP_PRIVATE_H
+
+#include "ns3/object.h"
+#include "ns3/ipv4-address.h"
+
+namespace ns3 {
+
+class NetDevice;
+class MacAddress;
+class Packet;
+class ArpL3Protocol;
+
+class IArpPrivate : public Object
+{
+public:
+ static const InterfaceId iid;
+ IArpPrivate (Ptr<ArpL3Protocol> arp);
+ virtual ~IArpPrivate ();
+ bool Lookup (Packet &p, Ipv4Address destination,
+ Ptr<NetDevice> device,
+ MacAddress *hardwareDestination);
+protected:
+ virtual void DoDispose (void);
+private:
+ Ptr<ArpL3Protocol> m_arp;
+};
+
+} // namespace ns3
+
+#endif /* I_ARP_PRIVATE_H */
--- a/src/internet-node/i-arp-private.cc Mon Jun 04 17:13:21 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#include "i-arp-private.h"
-#include "arp-l3-protocol.h"
-#include "ns3/assert.h"
-#include "ns3/net-device.h"
-
-namespace ns3 {
-
-const InterfaceId IArpPrivate::iid = MakeInterfaceId ("IArpPrivate", Object::iid);
-
-IArpPrivate::IArpPrivate (Ptr<ArpL3Protocol> arp)
- : m_arp (arp)
-{
- SetInterfaceId (IArpPrivate::iid);
-}
-IArpPrivate::~IArpPrivate ()
-{
- NS_ASSERT (m_arp == 0);
-}
-
-bool
-IArpPrivate::Lookup (Packet &p, Ipv4Address destination,
- Ptr<NetDevice> device,
- MacAddress *hardwareDestination)
-{
- return m_arp->Lookup (p, destination, device, hardwareDestination);
-}
-
-void
-IArpPrivate::DoDispose (void)
-{
- m_arp = 0;
- Object::DoDispose ();
-}
-
-
-} // namespace ns3
--- a/src/internet-node/i-arp-private.h Mon Jun 04 17:13:21 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#ifndef I_ARP_PRIVATE_H
-#define I_ARP_PRIVATE_H
-
-#include "ns3/object.h"
-#include "ns3/ipv4-address.h"
-
-namespace ns3 {
-
-class NetDevice;
-class MacAddress;
-class Packet;
-class ArpL3Protocol;
-
-class IArpPrivate : public Object
-{
-public:
- static const InterfaceId iid;
- IArpPrivate (Ptr<ArpL3Protocol> arp);
- virtual ~IArpPrivate ();
- bool Lookup (Packet &p, Ipv4Address destination,
- Ptr<NetDevice> device,
- MacAddress *hardwareDestination);
-protected:
- virtual void DoDispose (void);
-private:
- Ptr<ArpL3Protocol> m_arp;
-};
-
-} // namespace ns3
-
-#endif /* I_ARP_PRIVATE_H */
--- a/src/internet-node/internet-node.cc Mon Jun 04 17:13:21 2007 +0200
+++ b/src/internet-node/internet-node.cc Mon Jun 04 17:14:59 2007 +0200
@@ -31,7 +31,7 @@
#include "ipv4-l3-protocol.h"
#include "arp-l3-protocol.h"
#include "udp-impl.h"
-#include "i-arp-private.h"
+#include "arp-private.h"
#include "ipv4-impl.h"
#include "ipv4-private.h"