From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sun, 8 May 2011 10:21:57 +0000 (+0100)
Subject: Merge branch 'master' into dynamic_routing
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=176951c48c46f8191653998f42e62d2797484ce1;p=ns-moose.git

Merge branch 'master' into dynamic_routing

Conflicts:
	src/devices/bridge/wscript
---

176951c48c46f8191653998f42e62d2797484ce1
diff --cc src/devices/bridge/wscript
index d833533,31e9580..26d8ea2
--- a/src/devices/bridge/wscript
+++ b/src/devices/bridge/wscript
@@@ -11,17 -13,14 +13,19 @@@ def build(bld)
          'model/bridge-port-net-device.cc',
          'model/bridge-channel.cc',
  	'helper/moose-bridge-helper.cc',
-         'helper/bridge-helper.cc',
 +	'model/bpdu-header.cc',
 +	'model/configuration-bpdu-header.cc',
 +	'model/tcn-bpdu-header.cc',
 +	'model/rst-bpdu-header.cc',
+         'helper/ethernet-bridge-helper.cc',
          ]
      headers = bld.new_task_gen('ns3header')
      headers.module = 'bridge'
      headers.source = [
 +	'model/bpdu-header.h',
- 	'model/bridge-state.h',
+ 	'model/ethernet-bridge-state.h',
+ 	'model/ethernet-bridge-port-net-device.h',
+ 	'model/ethernet-bridge-net-device.h',
  	'model/moose-bridge-state.h',
          'model/moose-bridge-port-net-device.h',
  	'model/moose-bridge-net-device.h',