From 1b0dbb2b34e8307b3977a0cb07ca110c242e2ca6 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Mon, 14 May 2007 09:09:43 +0200 Subject: [PATCH] rename node.h to i-node.h --- SConstruct | 4 ++-- src/applications/onoff-application.cc | 2 +- src/devices/p2p/p2p-net-device.h | 2 +- src/internet-node/arp-ipv4-interface.cc | 2 +- src/internet-node/arp.cc | 2 +- src/internet-node/ascii-trace.cc | 2 +- src/internet-node/internet-node.h | 2 +- src/internet-node/ipv4-l4-demux.cc | 2 +- src/internet-node/ipv4-loopback-interface.cc | 2 +- src/internet-node/ipv4.cc | 2 +- src/internet-node/l3-demux.cc | 2 +- src/internet-node/pcap-trace.cc | 2 +- src/internet-node/udp-socket.cc | 2 +- src/internet-node/udp.cc | 2 +- src/internet-node/wscript | 2 +- src/node/application.cc | 2 +- src/node/application.h | 2 +- src/node/{node.cc => i-node.cc} | 2 +- src/node/{node.h => i-node.h} | 0 src/node/net-device.cc | 2 +- src/node/node-list.cc | 2 +- src/node/wscript | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) rename src/node/{node.cc => i-node.cc} (99%) rename src/node/{node.h => i-node.h} (100%) diff --git a/SConstruct b/SConstruct index e191b5b4e..f7d6b2ed8 100644 --- a/SConstruct +++ b/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', diff --git a/src/applications/onoff-application.cc b/src/applications/onoff-application.cc index cd7cd492f..3994cdcb9 100644 --- a/src/applications/onoff-application.cc +++ b/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" diff --git a/src/devices/p2p/p2p-net-device.h b/src/devices/p2p/p2p-net-device.h index e1eb8a666..893080dce 100644 --- a/src/devices/p2p/p2p-net-device.h +++ b/src/devices/p2p/p2p-net-device.h @@ -23,7 +23,7 @@ #include #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" diff --git a/src/internet-node/arp-ipv4-interface.cc b/src/internet-node/arp-ipv4-interface.cc index a4742d04c..e11f0b51a 100644 --- a/src/internet-node/arp-ipv4-interface.cc +++ b/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" diff --git a/src/internet-node/arp.cc b/src/internet-node/arp.cc index 3a085793e..a18128cdb 100644 --- a/src/internet-node/arp.cc +++ b/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" diff --git a/src/internet-node/ascii-trace.cc b/src/internet-node/ascii-trace.cc index 9b1a69d01..e1c4181f5 100644 --- a/src/internet-node/ascii-trace.cc +++ b/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" diff --git a/src/internet-node/internet-node.h b/src/internet-node/internet-node.h index 63d04ed6d..51905a938 100644 --- a/src/internet-node/internet-node.h +++ b/src/internet-node/internet-node.h @@ -27,7 +27,7 @@ #include #include -#include "ns3/node.h" +#include "ns3/i-node.h" namespace ns3 { diff --git a/src/internet-node/ipv4-l4-demux.cc b/src/internet-node/ipv4-l4-demux.cc index a60ed9629..c90e91c79 100644 --- a/src/internet-node/ipv4-l4-demux.cc +++ b/src/internet-node/ipv4-l4-demux.cc @@ -24,7 +24,7 @@ #include #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" diff --git a/src/internet-node/ipv4-loopback-interface.cc b/src/internet-node/ipv4-loopback-interface.cc index 97bffb066..195be2f8d 100644 --- a/src/internet-node/ipv4-loopback-interface.cc +++ b/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" diff --git a/src/internet-node/ipv4.cc b/src/internet-node/ipv4.cc index 14f58f99e..4c699fe5a 100644 --- a/src/internet-node/ipv4.cc +++ b/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" diff --git a/src/internet-node/l3-demux.cc b/src/internet-node/l3-demux.cc index e5912c64c..d3992f375 100644 --- a/src/internet-node/l3-demux.cc +++ b/src/internet-node/l3-demux.cc @@ -23,7 +23,7 @@ #include #include #include "ns3/composite-trace-resolver.h" -#include "ns3/node.h" +#include "ns3/i-node.h" #include "l3-demux.h" #include "l3-protocol.h" diff --git a/src/internet-node/pcap-trace.cc b/src/internet-node/pcap-trace.cc index 8ffe86555..a2d156544 100644 --- a/src/internet-node/pcap-trace.cc +++ b/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" diff --git a/src/internet-node/udp-socket.cc b/src/internet-node/udp-socket.cc index 233376318..3195f9ef9 100644 --- a/src/internet-node/udp-socket.cc +++ b/src/internet-node/udp-socket.cc @@ -18,7 +18,7 @@ * * Author: Mathieu Lacage */ -#include "ns3/node.h" +#include "ns3/i-node.h" #include "udp-socket.h" #include "udp.h" #include "ipv4-end-point.h" diff --git a/src/internet-node/udp.cc b/src/internet-node/udp.cc index 8a0ffc55a..d95152dc8 100644 --- a/src/internet-node/udp.cc +++ b/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" diff --git a/src/internet-node/wscript b/src/internet-node/wscript index 27782f7ee..d9fb454df 100644 --- a/src/internet-node/wscript +++ b/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', ] diff --git a/src/node/application.cc b/src/node/application.cc index 3346da3c2..985f8c513 100644 --- a/src/node/application.cc +++ b/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" diff --git a/src/node/application.h b/src/node/application.h index f761467fe..4a1149323 100644 --- a/src/node/application.h +++ b/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 { diff --git a/src/node/node.cc b/src/node/i-node.cc similarity index 99% rename from src/node/node.cc rename to src/node/i-node.cc index ca8871080..5eab3b1d0 100644 --- a/src/node/node.cc +++ b/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" diff --git a/src/node/node.h b/src/node/i-node.h similarity index 100% rename from src/node/node.h rename to src/node/i-node.h diff --git a/src/node/net-device.cc b/src/node/net-device.cc index 7f5033ba4..cc4703ab6 100644 --- a/src/node/net-device.cc +++ b/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 { diff --git a/src/node/node-list.cc b/src/node/node-list.cc index 4fed7eb5e..0b9e0c9ae 100644 --- a/src/node/node-list.cc +++ b/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 diff --git a/src/node/wscript b/src/node/wscript index c1dc79598..2321f185d 100644 --- a/src/node/wscript +++ b/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',