Convert the bridge module to the new layout

examples/csma/wscript

@@ -4,12 +4,6 @@ def build(bld):
     obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet-stack'])
     obj.source = 'csma-one-subnet.cc'
 
-    obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet-stack'])
-    obj.source = 'csma-bridge.cc'
-
-    obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet-stack'])
-    obj.source = 'csma-bridge-one-hop.cc'
-
     obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet-stack'])
     obj.source = 'csma-broadcast.cc'
 

src/devices/bridge/examples/wscript

@@ -0,0 +1,10 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+
+    obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet-stack'])
+    obj.source = 'csma-bridge.cc'
+
+    obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet-stack'])
+    obj.source = 'csma-bridge-one-hop.cc'
+

src/devices/bridge/helper/bridge-helper.h

@@ -21,7 +21,7 @@
 #ifndef BRIDGE_HELPER_H
 #define BRIDGE_HELPER_H
 
-#include "net-device-container.h"
+#include "ns3/net-device-container.h"
 #include "ns3/object-factory.h"
 #include <string>
 

src/devices/bridge/wscript

@@ -3,12 +3,17 @@
 def build(bld):
     obj = bld.create_ns3_module('bridge', ['node'])
     obj.source = [
-        'bridge-net-device.cc',
-        'bridge-channel.cc',
+        'model/bridge-net-device.cc',
+        'model/bridge-channel.cc',
+        'helper/bridge-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'bridge'
     headers.source = [
-        'bridge-net-device.h',
-        'bridge-channel.h',
+        'model/bridge-net-device.h',
+        'model/bridge-channel.h',
+        'helper/bridge-helper.h',
         ]
+
+    if bld.env['ENABLE_EXAMPLES']:
+        bld.add_subdirs('examples')

src/helper/wscript

@@ -19,7 +19,6 @@ def build(bld):
         'packet-socket-helper.cc',
         'ipv4-interface-container.cc',
         'udp-echo-helper.cc',
-        'bridge-helper.cc',
         'yans-wifi-helper.cc',
         'spectrum-helper.cc',
         'adhoc-aloha-noack-ideal-phy-helper.cc',
@@ -74,7 +73,6 @@ def build(bld):
         'packet-socket-helper.h',
         'ipv4-interface-container.h',
         'udp-echo-helper.h',
-        'bridge-helper.h',
         'yans-wifi-helper.h',
         'spectrum-helper.h',
         'adhoc-aloha-noack-ideal-phy-helper.h',

test.py

@@ -189,7 +189,7 @@ example_tests = [
 # hardcoded.
 #
 python_tests = [
-    ("examples/csma/csma-bridge.py", "True"),
+    ("src/devices/bridge/examples/csma-bridge.py", "True"),
 
     ("src/contrib/flowmon/examples/wifi-olsr-flowmon.py", "True"),