Make dot11s and flame modules be subdirectories of mesh

2011-03-07 10:46:12 -08:00
parent 187275d5b7
commit 1d41d30c36
95 changed files with 2 additions and 2 deletions
--- a/src/mesh/model/dot11s/helper/dot11s-installer.cc
+++ b/src/mesh/model/dot11s/helper/dot11s-installer.cc
--- a/src/mesh/model/dot11s/helper/dot11s-installer.h
+++ b/src/mesh/model/dot11s/helper/dot11s-installer.h
--- a/src/mesh/model/dot11s/model/airtime-metric.cc
+++ b/src/mesh/model/dot11s/model/airtime-metric.cc
--- a/src/mesh/model/dot11s/model/airtime-metric.h
+++ b/src/mesh/model/dot11s/model/airtime-metric.h
--- a/src/mesh/model/dot11s/model/dot11s-mac-header.cc
+++ b/src/mesh/model/dot11s/model/dot11s-mac-header.cc
--- a/src/mesh/model/dot11s/model/dot11s-mac-header.h
+++ b/src/mesh/model/dot11s/model/dot11s-mac-header.h
--- a/src/mesh/model/dot11s/model/dot11s.h
+++ b/src/mesh/model/dot11s/model/dot11s.h
--- a/src/mesh/model/dot11s/model/hwmp-protocol-mac.cc
+++ b/src/mesh/model/dot11s/model/hwmp-protocol-mac.cc
--- a/src/mesh/model/dot11s/model/hwmp-protocol-mac.h
+++ b/src/mesh/model/dot11s/model/hwmp-protocol-mac.h
--- a/src/mesh/model/dot11s/model/hwmp-protocol.cc
+++ b/src/mesh/model/dot11s/model/hwmp-protocol.cc
--- a/src/mesh/model/dot11s/model/hwmp-protocol.h
+++ b/src/mesh/model/dot11s/model/hwmp-protocol.h
--- a/src/mesh/model/dot11s/model/hwmp-rtable.cc
+++ b/src/mesh/model/dot11s/model/hwmp-rtable.cc
--- a/src/mesh/model/dot11s/model/hwmp-rtable.h
+++ b/src/mesh/model/dot11s/model/hwmp-rtable.h
--- a/src/mesh/model/dot11s/model/hwmp-tag.cc
+++ b/src/mesh/model/dot11s/model/hwmp-tag.cc
--- a/src/mesh/model/dot11s/model/hwmp-tag.h
+++ b/src/mesh/model/dot11s/model/hwmp-tag.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-beacon-timing.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-configuration.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-configuration.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-configuration.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-configuration.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-id.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-id.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-id.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-id.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-metric-report.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-metric-report.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-metric-report.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-metric-report.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-peer-management.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-peer-management.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-peer-management.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-peer-management.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-peering-protocol.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-perr.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-perr.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-perr.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-perr.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-prep.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-prep.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-prep.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-prep.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-preq.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-preq.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-preq.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-preq.h
--- a/src/mesh/model/dot11s/model/ie-dot11s-rann.cc
+++ b/src/mesh/model/dot11s/model/ie-dot11s-rann.cc
--- a/src/mesh/model/dot11s/model/ie-dot11s-rann.h
+++ b/src/mesh/model/dot11s/model/ie-dot11s-rann.h
--- a/src/mesh/model/dot11s/model/peer-link-frame.cc
+++ b/src/mesh/model/dot11s/model/peer-link-frame.cc
--- a/src/mesh/model/dot11s/model/peer-link-frame.h
+++ b/src/mesh/model/dot11s/model/peer-link-frame.h
--- a/src/mesh/model/dot11s/model/peer-link.cc
+++ b/src/mesh/model/dot11s/model/peer-link.cc
--- a/src/mesh/model/dot11s/model/peer-link.h
+++ b/src/mesh/model/dot11s/model/peer-link.h
--- a/src/mesh/model/dot11s/model/peer-management-protocol-mac.cc
+++ b/src/mesh/model/dot11s/model/peer-management-protocol-mac.cc
--- a/src/mesh/model/dot11s/model/peer-management-protocol-mac.h
+++ b/src/mesh/model/dot11s/model/peer-management-protocol-mac.h
--- a/src/mesh/model/dot11s/model/peer-management-protocol.cc
+++ b/src/mesh/model/dot11s/model/peer-management-protocol.cc
--- a/src/mesh/model/dot11s/model/peer-management-protocol.h
+++ b/src/mesh/model/dot11s/model/peer-management-protocol.h
--- a/src/mesh/model/dot11s/test/dot11s-test-suite.cc
+++ b/src/mesh/model/dot11s/test/dot11s-test-suite.cc
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression.cc
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression.cc
--- a/src/mesh/model/dot11s/test/hwmp-proactive-regression.h
+++ b/src/mesh/model/dot11s/test/hwmp-proactive-regression.h
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression.cc
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression.cc
--- a/src/mesh/model/dot11s/test/hwmp-reactive-regression.h
+++ b/src/mesh/model/dot11s/test/hwmp-reactive-regression.h
--- a/src/mesh/model/dot11s/test/hwmp-simplest-regression-test-0-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-simplest-regression-test-0-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-simplest-regression-test-1-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-simplest-regression-test-1-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-simplest-regression.cc
+++ b/src/mesh/model/dot11s/test/hwmp-simplest-regression.cc
--- a/src/mesh/model/dot11s/test/hwmp-simplest-regression.h
+++ b/src/mesh/model/dot11s/test/hwmp-simplest-regression.h
--- a/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
+++ b/src/mesh/model/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
--- a/src/mesh/model/dot11s/test/hwmp-target-flags-regression.cc
+++ b/src/mesh/model/dot11s/test/hwmp-target-flags-regression.cc
--- a/src/mesh/model/dot11s/test/hwmp-target-flags-regression.h
+++ b/src/mesh/model/dot11s/test/hwmp-target-flags-regression.h
--- a/src/mesh/model/dot11s/test/pmp-regression-test-0-1.pcap
+++ b/src/mesh/model/dot11s/test/pmp-regression-test-0-1.pcap
--- a/src/mesh/model/dot11s/test/pmp-regression-test-1-1.pcap
+++ b/src/mesh/model/dot11s/test/pmp-regression-test-1-1.pcap
--- a/src/mesh/model/dot11s/test/pmp-regression.cc
+++ b/src/mesh/model/dot11s/test/pmp-regression.cc
--- a/src/mesh/model/dot11s/test/pmp-regression.h
+++ b/src/mesh/model/dot11s/test/pmp-regression.h
--- a/src/mesh/model/dot11s/test/regression.cc
+++ b/src/mesh/model/dot11s/test/regression.cc
--- a/src/mesh/model/dot11s/waf
+++ b/src/mesh/model/dot11s/waf
--- a/src/mesh/model/dot11s/wscript
+++ b/src/mesh/model/dot11s/wscript
--- a/src/mesh/model/flame/helper/flame-installer.cc
+++ b/src/mesh/model/flame/helper/flame-installer.cc
--- a/src/mesh/model/flame/helper/flame-installer.h
+++ b/src/mesh/model/flame/helper/flame-installer.h
--- a/src/mesh/model/flame/model/flame-header.cc
+++ b/src/mesh/model/flame/model/flame-header.cc
--- a/src/mesh/model/flame/model/flame-header.h
+++ b/src/mesh/model/flame/model/flame-header.h
--- a/src/mesh/model/flame/model/flame-protocol-mac.cc
+++ b/src/mesh/model/flame/model/flame-protocol-mac.cc
--- a/src/mesh/model/flame/model/flame-protocol-mac.h
+++ b/src/mesh/model/flame/model/flame-protocol-mac.h
--- a/src/mesh/model/flame/model/flame-protocol.cc
+++ b/src/mesh/model/flame/model/flame-protocol.cc
--- a/src/mesh/model/flame/model/flame-protocol.h
+++ b/src/mesh/model/flame/model/flame-protocol.h
--- a/src/mesh/model/flame/model/flame-rtable.cc
+++ b/src/mesh/model/flame/model/flame-rtable.cc
--- a/src/mesh/model/flame/model/flame-rtable.h
+++ b/src/mesh/model/flame/model/flame-rtable.h
--- a/src/mesh/model/flame/test/flame-regression-test-0-1.pcap
+++ b/src/mesh/model/flame/test/flame-regression-test-0-1.pcap
--- a/src/mesh/model/flame/test/flame-regression-test-1-1.pcap
+++ b/src/mesh/model/flame/test/flame-regression-test-1-1.pcap
--- a/src/mesh/model/flame/test/flame-regression-test-2-1.pcap
+++ b/src/mesh/model/flame/test/flame-regression-test-2-1.pcap
--- a/src/mesh/model/flame/test/flame-regression.cc
+++ b/src/mesh/model/flame/test/flame-regression.cc
--- a/src/mesh/model/flame/test/flame-regression.h
+++ b/src/mesh/model/flame/test/flame-regression.h
--- a/src/mesh/model/flame/test/flame-test-suite.cc
+++ b/src/mesh/model/flame/test/flame-test-suite.cc
--- a/src/mesh/model/flame/test/regression.cc
+++ b/src/mesh/model/flame/test/regression.cc
--- a/src/mesh/model/flame/wscript
+++ b/src/mesh/model/flame/wscript
--- a/src/wscript
+++ b/src/wscript
@@ -42,8 +42,8 @@ all_modules = (
    'uan',
    'spectrum',
    'mesh',   
-    'dot11s',
-    'flame',
+    'mesh/model/dot11s',
+    'mesh/model/flame',
    'test',
    'test/perf',
    'test/ns3tcp',