rename node.h to i-node.h

SConstruct

@@ -196,7 +196,7 @@ node = build.Ns3Module ('node', 'src/node')
 ns3.add (node)
 node.add_deps (['core', 'common', 'simulator'])
 node.add_sources ([
-    'node.cc',
+    'i-node.cc',
     'ipv4-address.cc',
     'net-device.cc',
     'mac-address.cc',
@@ -212,7 +212,7 @@ node.add_sources ([
     'application.cc',
     ])
 node.add_inst_headers ([
-    'node.h',
+    'i-node.h',
     'ipv4-address.h',
     'net-device.h',
     'mac-address.h',

src/applications/onoff-application.cc

@@ -23,7 +23,7 @@
 // Adapted from ApplicationOnOff in GTNetS.
 
 #include "ns3/ipv4-address.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/nstime.h"
 #include "ns3/data-rate.h"
 #include "ns3/random-variable.h"

src/devices/p2p/p2p-net-device.h

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include "ns3/mac-address.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/net-device.h"
 #include "ns3/callback.h"
 #include "ns3/packet.h"

src/internet-node/arp-ipv4-interface.cc

@@ -22,7 +22,7 @@
 
 #include "ns3/packet.h"
 #include "ns3/composite-trace-resolver.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/net-device.h"
 
 #include "arp-ipv4-interface.h"

src/internet-node/arp.cc

@@ -21,7 +21,7 @@
 #include "ns3/packet.h"
 #include "ns3/debug.h"
 #include "ns3/empty-trace-resolver.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/net-device.h"
 
 #include "arp.h"

src/internet-node/ascii-trace.cc

@@ -23,7 +23,7 @@
 #include "ns3/trace-context.h"
 #include "ns3/trace-root.h"
 #include "ns3/simulator.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/queue.h"
 #include "ns3/node-list.h"
 #include "ns3/llc-snap-header.h"

src/internet-node/internet-node.h

@@ -27,7 +27,7 @@
 #include <list>
 #include <string>
 
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 
 namespace ns3 {
 

src/internet-node/ipv4-l4-demux.cc

@@ -24,7 +24,7 @@
 
 #include <sstream>
 #include "ns3/composite-trace-resolver.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ipv4-l4-demux.h"
 #include "ipv4-l4-protocol.h"
 

src/internet-node/ipv4-loopback-interface.cc

@@ -21,7 +21,7 @@
  */
 #include "ns3/empty-trace-resolver.h"
 #include "ns3/net-device.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ipv4-loopback-interface.h"
 #include "i-ipv4-private.h"
 

src/internet-node/ipv4.cc

@@ -26,7 +26,7 @@
 #include "ns3/callback.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4-route.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/net-device.h"
 
 #include "ipv4.h"

src/internet-node/l3-demux.cc

@@ -23,7 +23,7 @@
 #include <sstream>
 #include <string>
 #include "ns3/composite-trace-resolver.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "l3-demux.h"
 #include "l3-protocol.h"
 

src/internet-node/pcap-trace.cc

@@ -27,7 +27,7 @@
 #include "ns3/callback.h"
 #include "ns3/pcap-writer.h"
 #include "ns3/node-list.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 
 #include "ipv4.h"
 

src/internet-node/udp-socket.cc

@@ -18,7 +18,7 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "udp-socket.h"
 #include "udp.h"
 #include "ipv4-end-point.h"

src/internet-node/udp.cc

@@ -22,7 +22,7 @@
 #include "ns3/assert.h"
 #include "ns3/packet.h"
 #include "ns3/empty-trace-resolver.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 
 #include "udp.h"
 #include "udp-header.h"

src/internet-node/wscript

@@ -37,7 +37,7 @@ def build(bld):
 
     headers = bld.create_obj('ns3header')
     headers.source = [
-        'internet-node.h',
+        'internet-i-node.h',
         'ascii-trace.h',
         'pcap-trace.h',
         ]

src/node/application.cc

@@ -22,7 +22,7 @@
 // George F. Riley, Georgia Tech, Fall 2006
 
 #include "application.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 #include "ns3/nstime.h"
 #include "ns3/random-variable.h"
 #include "ns3/simulator.h"

src/node/application.h

@@ -25,7 +25,7 @@
 #include "ns3/nstime.h"
 #include "ns3/object.h"
 #include "ns3/ptr.h"
-#include "ns3/node.h"
+#include "ns3/i-node.h"
 
 namespace ns3 {
 

src/node/i-node.cc

@@ -22,7 +22,7 @@
 // Implement the basic Node object for ns3.
 // George F. Riley, Georgia Tech, Fall 2006
 
-#include "node.h"
+#include "i-node.h"
 #include "node-list.h"
 #include "net-device.h"
 #include "application.h"

src/node/net-device.cc

@@ -26,7 +26,7 @@
 #include "channel.h"
 #include "net-device.h"
 #include "llc-snap-header.h"
-#include "node.h"
+#include "i-node.h"
 
 namespace ns3 {
 

src/node/node-list.cc

@@ -25,7 +25,7 @@
 #include "ns3/simulator.h"
 #include "ns3/simulation-singleton.h"
 #include "node-list.h"
-#include "node.h"
+#include "i-node.h"
 
 namespace {
 static class Initialization 

src/node/wscript

@@ -25,7 +25,7 @@ def build(bld):
 
     headers = bld.create_obj('ns3header')
     headers.source = [
-        'node.h',
+        'i-node.h',
         'ipv4-address.h',
         'net-device.h',
         'mac-address.h',