Merge node and common modules into new network module

src/applications/bulk-send/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('bulk-send', ['core', 'node'])
+    module = bld.create_ns3_module('bulk-send', ['core', 'network'])
     module.source = [
         'bulk-send-application.cc',
         ]

src/applications/onoff/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('onoff', ['core', 'node'])
+    module = bld.create_ns3_module('onoff', ['core', 'network'])
     module.source = [
         'onoff-application.cc',
         ]

src/applications/packet-sink/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('packet-sink', ['node'])
+    module = bld.create_ns3_module('packet-sink', ['network'])
     module.source = [
         'packet-sink.cc',
         ]

src/applications/v4ping/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('v4ping', ['node'])
+    module = bld.create_ns3_module('v4ping', ['network'])
     module.source = [
         'v4ping.cc',
         ]

src/common/wscript

@@ -1,51 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    common = bld.create_ns3_module('common', ['core', 'mobility'])
-    common.source = [
-        'buffer.cc',
-        'buffer-test.cc',
-        'packet-metadata.cc',
-        'packet-metadata-test.cc',
-        'packet.cc',
-        'packet-burst.cc',
-        'chunk.cc',
-        'header.cc',
-        'trailer.cc',
-        'data-rate.cc',
-        'error-model.cc',
-        'tag.cc',
-        'byte-tag-list.cc',
-        'tag-buffer.cc',
-        'packet-tag-list.cc',
-        'nix-vector.cc',
-        'pcap-file.cc',
-        'pcap-file-test-suite.cc',
-        'pcap-file-wrapper.cc',
-        'output-stream-wrapper.cc',
-        'sequence-number.cc',
-        ]
-
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'common'
-    headers.source = [
-        'buffer.h',
-        'chunk.h',
-        'header.h',
-        'trailer.h',
-        'packet.h',
-        'packet-burst.h',
-        'packet-metadata.h',
-        'data-rate.h',
-        'error-model.h',
-        'tag.h',
-        'byte-tag-list.h',
-        'tag-buffer.h',
-        'packet-tag-list.h',
-        'nix-vector.h',
-        'sgi-hashmap.h',
-        'pcap-file.h',
-        'pcap-file-wrapper.h',
-        'output-stream-wrapper.h',
-        'sequence-number.h',
-        ]

src/contrib/energy/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('energy', ['node', 'wifi'])
+    obj = bld.create_ns3_module('energy', ['network', 'wifi'])
     obj.source = [
         'model/wifi-radio-energy-model.cc',
         'model/energy-source.cc',

src/contrib/stats/wscript

@@ -8,7 +8,7 @@ def configure(conf):
 
 
 def build(bld):
-    obj = bld.create_ns3_module('stats', ['node'])
+    obj = bld.create_ns3_module('stats', ['network'])
     obj.source = [
         'data-calculator.cc',
         'packet-data-calculators.cc',

src/contrib/topology-read/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('topology-read', ['node'])
+    obj = bld.create_ns3_module('topology-read', ['network'])
     obj.source = [
        'topology-reader.cc',
        'inet-topology-reader.cc',

src/contrib/wscript

@@ -20,7 +20,7 @@ def configure(conf):
 
 
 def build(bld):
-    module = bld.create_ns3_module('contrib', ['core', 'common'])
+    module = bld.create_ns3_module('contrib', ['core', 'network'])
     module.source = [
         'event-garbage-collector.cc',
         'gnuplot.cc',

src/devices/bridge/examples/csma-bridge-one-hop.cc

@@ -70,7 +70,7 @@
 #include <fstream>
 
 #include "ns3/core-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/bridge-module.h"

src/devices/bridge/examples/csma-bridge.cc

@@ -33,7 +33,7 @@
 #include <fstream>
 
 #include "ns3/core-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/core-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/bridge-module.h"

src/devices/bridge/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('bridge', ['node'])
+    obj = bld.create_ns3_module('bridge', ['network'])
     obj.source = [
         'model/bridge-net-device.cc',
         'model/bridge-channel.cc',

src/devices/csma/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('csma', ['node'])
+    obj = bld.create_ns3_module('csma', ['network'])
     obj.source = [
         'backoff.cc',
         'csma-net-device.cc',

src/devices/emu/wscript

@@ -20,7 +20,7 @@ def configure(conf):
         conf.env.append_value('NS3_EXECUTABLE_PATH', emucreatordir)
 
 def build(bld):
-    module = bld.create_ns3_module('emu', ['node'])
+    module = bld.create_ns3_module('emu', ['network'])
     module.source = [
         ]
     headers = bld.new_task_gen('ns3header')

src/devices/lte/examples/lte-amc.cc

@@ -25,9 +25,7 @@
 #include <iostream>
 #include <vector>
 #include <ns3/core-module.h>
-#include <ns3/common-module.h>
-#include <ns3/node-module.h>
-#include <ns3/core-module.h>
+#include <ns3/network-module.h>
 #include <ns3/log.h>
 #include <string>
 #include <ns3/mobility-module.h>

src/devices/lte/examples/lte-channel-model.cc

@@ -25,9 +25,7 @@
 #include <iostream>
 #include <vector>
 #include <ns3/core-module.h>
-#include <ns3/common-module.h>
-#include <ns3/node-module.h>
-#include <ns3/core-module.h>
+#include <ns3/network-module.h>
 #include <ns3/log.h>
 #include <string>
 #include <ns3/mobility-module.h>

src/devices/lte/examples/lte-device.cc

@@ -11,8 +11,7 @@
 //               +------------+
 
 #include "ns3/core-module.h"
-#include "ns3/common-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/mobility-module.h"
 #include "ns3/contrib-module.h"

src/devices/lte/examples/lte-multiple-flows.cc

@@ -11,8 +11,7 @@
 //               +------------+
 
 #include "ns3/core-module.h"
-#include "ns3/common-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/mobility-module.h"
 #include "ns3/contrib-module.h"

src/devices/lte/examples/lte-phy-downlink.cc

@@ -49,9 +49,7 @@
 
 #include <iostream>
 #include <ns3/core-module.h>
-#include <ns3/common-module.h>
-#include <ns3/node-module.h>
-#include <ns3/core-module.h>
+#include <ns3/network-module.h>
 #include <ns3/single-model-spectrum-channel.h>
 #include <ns3/log.h>
 #include <string>

src/devices/lte/examples/lte-phy-uplink.cc

@@ -50,9 +50,7 @@
 
 #include <iostream>
 #include <ns3/core-module.h>
-#include <ns3/common-module.h>
-#include <ns3/node-module.h>
-#include <ns3/core-module.h>
+#include <ns3/network-module.h>
 #include <ns3/single-model-spectrum-channel.h>
 #include <ns3/log.h>
 #include <string>

src/devices/lte/wscript

@@ -2,7 +2,7 @@
 
 def build(bld):
 
-    module = bld.create_ns3_module('lte', ['core', 'node', 'common', 'spectrum'])
+    module = bld.create_ns3_module('lte', ['core', 'network', 'spectrum'])
     module.source = [
         'model/lte-spectrum-phy.cc',
         'model/enb-lte-spectrum-phy.cc',

src/devices/point-to-point/wscript

@@ -2,7 +2,7 @@
 
 
 def build(bld):
-    module = bld.create_ns3_module('point-to-point', ['node'])
+    module = bld.create_ns3_module('point-to-point', ['network'])
     module.source = [
         'point-to-point-net-device.cc',
         'point-to-point-channel.cc',

src/devices/tap-bridge/wscript

@@ -20,7 +20,7 @@ def configure(conf):
         conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)
 
 def build(bld):
-    module = bld.create_ns3_module('tap-bridge', ['node'])
+    module = bld.create_ns3_module('tap-bridge', ['network'])
     module.source = [
         ]
     headers = bld.new_task_gen('ns3header')

src/devices/uan/examples/uan-cw-example.cc

@@ -38,8 +38,7 @@
 
 #include "uan-cw-example.h"
 #include "ns3/core-module.h"
-#include "ns3/common-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/mobility-module.h"
 #include "ns3/contrib-module.h"
 #include "ns3/helper-module.h"

src/devices/uan/examples/uan-cw-example.h

@@ -21,8 +21,7 @@
 #ifndef UANCWEXAMPLE_H
 #define UANCWEXAMPLE_H
 
-#include "ns3/common-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/contrib-module.h"
 #include "ns3/uan-module.h"
 #include "ns3/helper-module.h"

src/devices/uan/examples/uan-rc-example.cc

@@ -53,10 +53,9 @@
 
 #include "uan-rc-example.h"
 #include "ns3/core-module.h"
-#include "ns3/common-module.h"
+#include "ns3/network-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/node-module.h"
 #include "ns3/log.h"
 #include "ns3/config.h"
 #include "ns3/callback.h"

src/devices/uan/examples/uan-rc-example.h

@@ -21,8 +21,7 @@
 #ifndef UANRCEXAMPLE_H
 #define UANRCEXAMPLE_H
 
-#include "ns3/common-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/contrib-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/uan-module.h"

src/devices/uan/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('uan', ['node', 'energy'])
+    module = bld.create_ns3_module('uan', ['network', 'energy'])
     module.source = [
         'model/uan-channel.cc',
         'model/uan-phy-gen.cc',

src/devices/virtual-net-device/examples/virtual-net-device.cc

@@ -53,7 +53,7 @@
 
 #include "ns3/core-module.h"
 #include "ns3/core-module.h"
-#include "ns3/node-module.h"
+#include "ns3/network-module.h"
 #include "ns3/helper-module.h"
 #include "ns3/virtual-net-device.h"
 #include "ns3/ipv4-global-routing-helper.h"

src/devices/virtual-net-device/wscript

@@ -2,7 +2,7 @@
 
 
 def build(bld):
-    module = bld.create_ns3_module('virtual-net-device', ['node'])
+    module = bld.create_ns3_module('virtual-net-device', ['network'])
     module.source = [
         'model/virtual-net-device.cc',
         ]

src/devices/wifi/wscript

@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('wifi', ['node'])
+    obj = bld.create_ns3_module('wifi', ['network'])
     obj.source = [
         'wifi-information-element.cc',
         'wifi-information-element-vector.cc',

src/devices/wimax/wscript

@@ -1,6 +1,6 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 def build(bld):
-    obj = bld.create_ns3_module('wimax', ['node'])
+    obj = bld.create_ns3_module('wimax', ['network'])
     obj.source = [
             'cid.cc',
             'cid-factory.cc',

src/helper/aodv-helper.h

@@ -22,7 +22,7 @@
 
 #include "ns3/object-factory.h"
 #include "ns3/node.h"
-#include "node-container.h"
+#include "ns3/node-container.h"
 #include "ipv4-routing-helper.h"
 
 namespace ns3

src/helper/bulk-send-helper.h

@@ -29,8 +29,8 @@
 #include "ns3/address.h"
 #include "ns3/attribute.h"
 #include "ns3/net-device.h"
-#include "node-container.h"
-#include "application-container.h"
+#include "ns3/node-container.h"
+#include "ns3/application-container.h"
 
 namespace ns3 {
 

src/helper/internet-stack-helper.h

@@ -21,8 +21,8 @@
 #ifndef INTERNET_STACK_HELPER_H
 #define INTERNET_STACK_HELPER_H
 
-#include "node-container.h"
-#include "net-device-container.h"
+#include "ns3/node-container.h"
+#include "ns3/net-device-container.h"
 #include "ns3/packet.h"
 #include "ns3/ptr.h"
 #include "ns3/object-factory.h"

src/helper/ipv4-address-helper.h

@@ -20,7 +20,7 @@
 #define IPV4_ADDRESS_HELPER_H
 
 #include "ns3/ipv4-address.h"
-#include "net-device-container.h"
+#include "ns3/net-device-container.h"
 #include "ipv4-interface-container.h"
 
 namespace ns3 {

src/helper/ipv6-address-helper.h

@@ -25,7 +25,7 @@
 
 #include "ns3/ipv6-address.h"
 
-#include "net-device-container.h"
+#include "ns3/net-device-container.h"
 #include "ipv6-interface-container.h"
 
 namespace ns3

src/helper/on-off-helper.h

@@ -26,8 +26,8 @@
 #include "ns3/address.h"
 #include "ns3/attribute.h"
 #include "ns3/net-device.h"
-#include "node-container.h"
-#include "application-container.h"
+#include "ns3/node-container.h"
+#include "ns3/application-container.h"
 
 namespace ns3 {
 

src/helper/packet-sink-helper.h

@@ -22,8 +22,8 @@
 
 #include "ns3/object-factory.h"
 #include "ns3/ipv4-address.h"
-#include "node-container.h"
-#include "application-container.h"
+#include "ns3/node-container.h"
+#include "ns3/application-container.h"
 
 namespace ns3 {
 

src/helper/ping6-helper.h

@@ -26,8 +26,8 @@
 #include "ns3/object-factory.h"
 #include "ns3/ipv6-address.h"
 
-#include "application-container.h"
-#include "node-container.h"
+#include "ns3/application-container.h"
+#include "ns3/node-container.h"
 
 namespace ns3 {
 

src/helper/tap-bridge-helper.h

@@ -19,7 +19,7 @@
 #ifndef TAP_BRIDGE_HELPER_H
 #define TAP_BRIDGE_HELPER_H
 
-#include "net-device-container.h"
+#include "ns3/net-device-container.h"
 #include "ns3/object-factory.h"
 #include "ns3/tap-bridge.h"
 #include <string>

src/helper/udp-client-server-helper.h

@@ -21,8 +21,8 @@
 #define UDP_CLIENT_SERVER_HELPER_H
 
 #include <stdint.h>
-#include "application-container.h"
-#include "node-container.h"
+#include "ns3/application-container.h"
+#include "ns3/node-container.h"
 #include "ns3/object-factory.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/udp-server.h"

src/helper/udp-echo-helper.h

@@ -21,8 +21,8 @@
 #define UDP_ECHO_HELPER_H
 
 #include <stdint.h>
-#include "application-container.h"
-#include "node-container.h"
+#include "ns3/application-container.h"
+#include "ns3/node-container.h"
 #include "ns3/object-factory.h"
 #include "ns3/ipv4-address.h"
 

src/helper/v4ping-helper.h

@@ -1,8 +1,8 @@
 #ifndef V4PING_HELPER_H
 #define V4PING_HELPER_H
 
-#include "node-container.h"
-#include "application-container.h"
+#include "ns3/node-container.h"
+#include "ns3/application-container.h"
 #include "ns3/object-factory.h"
 
 namespace ns3 {

src/helper/wscript

@@ -1,10 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    helper = bld.create_ns3_module('helper', ['mobility', 'node', 'internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
+    helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
     helper.source = [
-        'node-container.cc',
-        'net-device-container.cc',
         'wifi-helper.cc',
         'point-to-point-helper.cc',
         'csma-helper.cc',
@@ -12,10 +10,8 @@ def build(bld):
         'ns2-mobility-helper.cc',
         'ipv4-address-helper.cc',
         'internet-stack-helper.cc',
-        'application-container.cc',
         'on-off-helper.cc',
         'packet-sink-helper.cc',
-        'packet-socket-helper.cc',
         'ipv4-interface-container.cc',
         'udp-echo-helper.cc',
         'yans-wifi-helper.cc',
@@ -49,8 +45,6 @@ def build(bld):
     headers = bld.new_task_gen('ns3header')
     headers.module = 'helper'
     headers.source = [
-        'node-container.h',
-        'net-device-container.h',
         'wifi-helper.h',
         'point-to-point-helper.h',
         'csma-helper.h',
@@ -58,10 +52,8 @@ def build(bld):
         'ns2-mobility-helper.h',
         'ipv4-address-helper.h',
         'internet-stack-helper.h',
-        'application-container.h',
         'on-off-helper.h',
         'packet-sink-helper.h',
-        'packet-socket-helper.h',
         'ipv4-interface-container.h',
         'udp-echo-helper.h',
         'yans-wifi-helper.h',

src/internet-stack/ipv4-interface-address.h

@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <ostream>
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-stack/ipv4-raw-socket-factory.h

@@ -20,7 +20,7 @@
 #ifndef IPV4_RAW_SOCKET_FACTORY_H
 #define IPV4_RAW_SOCKET_FACTORY_H
 
-#include "socket-factory.h"
+#include "ns3/socket-factory.h"
 
 namespace ns3 {
 

src/internet-stack/ipv4-route.cc

@@ -18,7 +18,7 @@
  */
 
 #include "ipv4-route.h"
-#include "net-device.h"
+#include "ns3/net-device.h"
 #include "ns3/assert.h"
 
 namespace ns3 {

src/internet-stack/ipv4-route.h

@@ -24,7 +24,7 @@
 #include <ostream>
 
 #include "ns3/simple-ref-count.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 
 namespace ns3 {
 

src/internet-stack/ipv4-routing-protocol.h

@@ -23,7 +23,7 @@
 #include "ns3/object.h"
 #include "ns3/socket.h"
 #include "ipv4-header.h"
-#include "ipv4-interface-address.h"
+#include "ns3/ipv4-interface-address.h"
 #include "ipv4.h"
 #include "ns3/output-stream-wrapper.h"
 

src/internet-stack/ipv4.h

@@ -24,7 +24,7 @@
 #include "ns3/object.h"
 #include "ns3/socket.h"
 #include "ns3/callback.h"
-#include "ipv4-address.h"
+#include "ns3/ipv4-address.h"
 #include "ipv4-interface-address.h"
 
 namespace ns3 {

src/internet-stack/ipv6-header.cc

@@ -22,7 +22,7 @@
 #include "ns3/log.h"
 #include "ns3/header.h"
 
-#include "address-utils.h"
+#include "ns3/address-utils.h"
 #include "ipv6-header.h"
 
 NS_LOG_COMPONENT_DEFINE ("Ipv6Header");

src/internet-stack/ipv6-interface-address.h

@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-#include "ipv6-address.h"
+#include "ns3/ipv6-address.h"
 
 namespace ns3
 {

src/internet-stack/ipv6-raw-socket-factory.h

@@ -21,7 +21,7 @@
 #ifndef IPV6_RAW_SOCKET_FACTORY_H
 #define IPV6_RAW_SOCKET_FACTORY_H
 
-#include "socket-factory.h"
+#include "ns3/socket-factory.h"
 
 namespace ns3 
 {

src/internet-stack/ipv6-route.cc

@@ -20,7 +20,7 @@
 
 #include <iostream>
 
-#include "net-device.h"
+#include "ns3/net-device.h"
 #include "ipv6-route.h"
 
 namespace ns3

src/internet-stack/ipv6-route.h

@@ -27,7 +27,7 @@
 
 #include "ns3/simple-ref-count.h"
 
-#include "ipv6-address.h"
+#include "ns3/ipv6-address.h"
 
 namespace ns3
 {

src/internet-stack/ipv6.h

@@ -29,7 +29,7 @@
 #include "ns3/socket.h"
 #include "ns3/callback.h"
 
-#include "ipv6-address.h"
+#include "ns3/ipv6-address.h"
 #include "ipv6-interface-address.h"
 
 namespace ns3 {

src/internet-stack/tcp-socket-factory.h

@@ -20,7 +20,7 @@
 #ifndef TCP_SOCKET_FACTORY_H
 #define TCP_SOCKET_FACTORY_H
 
-#include "socket-factory.h"
+#include "ns3/socket-factory.h"
 
 namespace ns3 {
 

src/internet-stack/tcp-socket.h

@@ -23,7 +23,7 @@
 #ifndef __TCP_SOCKET_H__
 #define __TCP_SOCKET_H__
 
-#include "socket.h"
+#include "ns3/socket.h"
 #include "ns3/traced-callback.h"
 #include "ns3/callback.h"
 #include "ns3/ptr.h"

src/internet-stack/udp-socket-factory.h

@@ -20,7 +20,7 @@
 #ifndef UDP_SOCKET_FACTORY_H
 #define UDP_SOCKET_FACTORY_H
 
-#include "socket-factory.h"
+#include "ns3/socket-factory.h"
 
 namespace ns3 {
 

src/internet-stack/udp-socket.h

@@ -23,7 +23,7 @@
 #ifndef __UDP_SOCKET_H__
 #define __UDP_SOCKET_H__
 
-#include "socket.h"
+#include "ns3/socket.h"
 #include "ns3/traced-callback.h"
 #include "ns3/callback.h"
 #include "ns3/ptr.h"

src/internet-stack/wscript

@@ -91,7 +91,7 @@ def configure(conf):
 
 
 def build(bld):
-    obj = bld.create_ns3_module('internet-stack', ['node'])
+    obj = bld.create_ns3_module('internet-stack', ['network'])
     obj.source = [
         'tcp-test.cc',
         'udp-test.cc',
@@ -147,6 +147,23 @@ def build(bld):
         'tcp-tx-buffer.cc',
         'ipv4-packet-info-tag.cc',
         'ipv6-packet-info-tag.cc',
+        'ipv4-interface-address.cc',
+        'ipv4-address-generator.cc',
+        'ipv4-header.cc',
+        'ipv4-route.cc',
+        'ipv4-routing-protocol.cc',
+        'udp-socket.cc',
+        'udp-socket-factory.cc',
+        'tcp-socket.cc',
+        'tcp-socket-factory.cc',
+        'ipv4.cc',
+        'ipv4-raw-socket-factory.cc',
+        'ipv6-header.cc',
+        'ipv6-interface-address.cc',
+        'ipv6-route.cc',
+        'ipv6.cc',
+        'ipv6-raw-socket-factory.cc',
+        'ipv6-routing-protocol.cc',
         ]
 
     headers = bld.new_task_gen('ns3header')
@@ -176,6 +193,23 @@ def build(bld):
         'loopback-net-device.h',
         'ipv4-packet-info-tag.h',
         'ipv6-packet-info-tag.h',
+        'ipv4-interface-address.h',
+        'ipv4-address-generator.h',
+        'ipv4-header.h',
+        'ipv4-route.h',
+        'ipv4-routing-protocol.h',
+        'udp-socket.h',
+        'udp-socket-factory.h',
+        'tcp-socket.h',
+        'tcp-socket-factory.h',
+        'ipv4.h',
+        'ipv4-raw-socket-factory.h',
+        'ipv6-header.h',
+        'ipv6-interface-address.h',
+        'ipv6-route.h',
+        'ipv6.h',
+        'ipv6-raw-socket-factory.h',
+        'ipv6-routing-protocol.h',
        ]
 
     if bld.env['NSC_ENABLED']: