--- a/SConstruct Mon Jun 04 17:06:03 2007 +0200
+++ b/SConstruct Mon Jun 04 17:13:21 2007 +0200
@@ -279,7 +279,7 @@
'ipv4-private.cc',
'ascii-trace.cc',
'pcap-trace.cc',
- 'i-udp-impl.cc',
+ 'udp-impl.cc',
])
inode.add_headers ([
'ipv4-header.h',
@@ -307,7 +307,7 @@
'udp-header.h',
'ipv4-interface.h',
'sgi-hashmap.h',
- 'i-udp-impl.h',
+ 'udp-impl.h',
])
inode.add_inst_headers ([
'internet-node.h',
--- a/src/internet-node/i-udp-impl.cc Mon Jun 04 17:06:03 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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-udp-impl.h"
-#include "udp.h"
-#include "ns3/socket.h"
-#include "ns3/assert.h"
-
-namespace ns3 {
-
-IUdpImpl::IUdpImpl (Ptr<Udp> udp)
- : m_udp (udp)
-{}
-IUdpImpl::~IUdpImpl ()
-{
- NS_ASSERT (m_udp == 0);
-}
-
-Ptr<Socket>
-IUdpImpl::CreateSocket (void)
-{
- return m_udp->CreateSocket ();
-}
-
-void
-IUdpImpl::DoDispose (void)
-{
- m_udp = 0;
- IUdp::DoDispose ();
-}
-
-} // namespace ns3
--- a/src/internet-node/i-udp-impl.h Mon Jun 04 17:06:03 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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_UDP_IMPL_H
-#define I_UDP_IMPL_H
-
-#include "ns3/i-udp.h"
-#include "ns3/ptr.h"
-
-namespace ns3 {
-
-class Udp;
-
-class IUdpImpl : public IUdp
-{
-public:
- IUdpImpl (Ptr<Udp> udp);
- virtual ~IUdpImpl ();
-
- virtual Ptr<Socket> CreateSocket (void);
-
-protected:
- virtual void DoDispose (void);
-private:
- Ptr<Udp> m_udp;
-};
-
-} // namespace ns3
-
-#endif /* I_UDP_IMPL_H */
--- a/src/internet-node/internet-node.cc Mon Jun 04 17:06:03 2007 +0200
+++ b/src/internet-node/internet-node.cc Mon Jun 04 17:13:21 2007 +0200
@@ -30,7 +30,7 @@
#include "udp.h"
#include "ipv4-l3-protocol.h"
#include "arp-l3-protocol.h"
-#include "i-udp-impl.h"
+#include "udp-impl.h"
#include "i-arp-private.h"
#include "ipv4-impl.h"
#include "ipv4-private.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/internet-node/udp-impl.cc Mon Jun 04 17:13:21 2007 +0200
@@ -0,0 +1,49 @@
+/* -*- 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 "udp-impl.h"
+#include "udp.h"
+#include "ns3/socket.h"
+#include "ns3/assert.h"
+
+namespace ns3 {
+
+IUdpImpl::IUdpImpl (Ptr<Udp> udp)
+ : m_udp (udp)
+{}
+IUdpImpl::~IUdpImpl ()
+{
+ NS_ASSERT (m_udp == 0);
+}
+
+Ptr<Socket>
+IUdpImpl::CreateSocket (void)
+{
+ return m_udp->CreateSocket ();
+}
+
+void
+IUdpImpl::DoDispose (void)
+{
+ m_udp = 0;
+ IUdp::DoDispose ();
+}
+
+} // namespace ns3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/internet-node/udp-impl.h Mon Jun 04 17:13:21 2007 +0200
@@ -0,0 +1,47 @@
+/* -*- 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_UDP_IMPL_H
+#define I_UDP_IMPL_H
+
+#include "ns3/i-udp.h"
+#include "ns3/ptr.h"
+
+namespace ns3 {
+
+class Udp;
+
+class IUdpImpl : public IUdp
+{
+public:
+ IUdpImpl (Ptr<Udp> udp);
+ virtual ~IUdpImpl ();
+
+ virtual Ptr<Socket> CreateSocket (void);
+
+protected:
+ virtual void DoDispose (void);
+private:
+ Ptr<Udp> m_udp;
+};
+
+} // namespace ns3
+
+#endif /* I_UDP_IMPL_H */