--- a/SConstruct Mon Jun 04 17:42:37 2007 +0200
+++ b/SConstruct Mon Jun 04 17:54:56 2007 +0200
@@ -217,7 +217,7 @@
'channel.cc',
'node-list.cc',
'socket.cc',
- 'i-socket-factory.cc',
+ 'socket-factory.cc',
'i-udp.cc',
'i-ipv4.cc',
'application.cc',
@@ -234,7 +234,7 @@
'channel.h',
'node-list.h',
'socket.h',
- 'i-socket-factory.h',
+ 'socket-factory.h',
'i-udp.h',
'i-ipv4.h',
'application.h',
--- a/samples/main-simple.cc Mon Jun 04 17:42:37 2007 +0200
+++ b/samples/main-simple.cc Mon Jun 04 17:54:56 2007 +0200
@@ -2,7 +2,7 @@
#include "ns3/internet-node.h"
#include "ns3/simulator.h"
-#include "ns3/i-socket-factory.h"
+#include "ns3/socket-factory.h"
#include "ns3/socket.h"
#include "ns3/nstime.h"
--- a/src/applications/onoff-application.cc Mon Jun 04 17:42:37 2007 +0200
+++ b/src/applications/onoff-application.cc Mon Jun 04 17:54:56 2007 +0200
@@ -29,7 +29,7 @@
#include "ns3/random-variable.h"
#include "ns3/socket.h"
#include "ns3/simulator.h"
-#include "ns3/i-socket-factory.h"
+#include "ns3/socket-factory.h"
#include "ns3/default-value.h"
#include "onoff-application.h"
--- a/src/node/i-socket-factory.cc Mon Jun 04 17:42:37 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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-socket-factory.h"
-
-namespace ns3 {
-
-const InterfaceId ISocketFactory::iid = MakeInterfaceId ("ISocketFactory", Object::iid);
-
-ISocketFactory::ISocketFactory ()
-{
- SetInterfaceId (ISocketFactory::iid);
-}
-
-} // namespace ns3
--- a/src/node/i-socket-factory.h Mon Jun 04 17:42:37 2007 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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_SOCKET_FACTORY_H
-#define I_SOCKET_FACTORY_H
-
-#include "ns3/object.h"
-#include "ns3/ptr.h"
-
-namespace ns3 {
-
-class Socket;
-
-class ISocketFactory : public Object
-{
-public:
- static const InterfaceId iid;
-
- ISocketFactory ();
-
- virtual Ptr<Socket> CreateSocket (void) = 0;
-};
-
-} // namespace ns3
-
-
-#endif /* I_SOCKET_FACTORY_H */
--- a/src/node/i-udp.h Mon Jun 04 17:42:37 2007 +0200
+++ b/src/node/i-udp.h Mon Jun 04 17:54:56 2007 +0200
@@ -21,7 +21,7 @@
#ifndef I_UDP_H
#define I_UDP_H
-#include "i-socket-factory.h"
+#include "socket-factory.h"
namespace ns3 {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/node/socket-factory.cc Mon Jun 04 17:54:56 2007 +0200
@@ -0,0 +1,32 @@
+/* -*- 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 "socket-factory.h"
+
+namespace ns3 {
+
+const InterfaceId ISocketFactory::iid = MakeInterfaceId ("ISocketFactory", Object::iid);
+
+ISocketFactory::ISocketFactory ()
+{
+ SetInterfaceId (ISocketFactory::iid);
+}
+
+} // namespace ns3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/node/socket-factory.h Mon Jun 04 17:54:56 2007 +0200
@@ -0,0 +1,44 @@
+/* -*- 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 SOCKET_FACTORY_H
+#define SOCKET_FACTORY_H
+
+#include "ns3/object.h"
+#include "ns3/ptr.h"
+
+namespace ns3 {
+
+class Socket;
+
+class ISocketFactory : public Object
+{
+public:
+ static const InterfaceId iid;
+
+ ISocketFactory ();
+
+ virtual Ptr<Socket> CreateSocket (void) = 0;
+};
+
+} // namespace ns3
+
+
+#endif /* SOCKET_FACTORY_H */