Modularize dot11s module and move it to src

src/devices/mesh/dot11s/wscript

@@ -1,45 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    obj = bld.create_ns3_module('dot11s', ['wifi', 'mesh'])
-    obj.source = [
-        'ie-dot11s-beacon-timing.cc',
-        'ie-dot11s-configuration.cc',
-        'ie-dot11s-id.cc',
-        'ie-dot11s-peer-management.cc',
-        'ie-dot11s-preq.cc',
-        'ie-dot11s-prep.cc',
-        'ie-dot11s-perr.cc',
-        'ie-dot11s-rann.cc',
-        'ie-dot11s-peering-protocol.cc',
-        'ie-dot11s-metric-report.cc',
-        'dot11s-mac-header.cc',
-        'peer-link-frame.cc',
-        'peer-link.cc',
-        'peer-management-protocol-mac.cc',
-        'peer-management-protocol.cc',
-        'hwmp-tag.cc',
-        'hwmp-rtable.cc',
-        'hwmp-protocol-mac.cc',
-        'hwmp-protocol.cc',
-        'airtime-metric.cc',
-        'test/dot11s-test-suite.cc',
-        'test/pmp-regression.cc',
-        'test/hwmp-reactive-regression.cc',
-        'test/hwmp-proactive-regression.cc',
-        'test/hwmp-simplest-regression.cc',
-        'test/hwmp-target-flags-regression.cc',
-        'test/regression.cc',
-
-        ]
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'dot11s'
-    headers.source = [
-        'hwmp-protocol.h',
-        'peer-management-protocol.h',
-        'ie-dot11s-beacon-timing.h',
-        'ie-dot11s-configuration.h',
-        'ie-dot11s-peer-management.h',
-        'ie-dot11s-id.h',
-        'peer-link.h',
-        ]

src/dot11s/test/dot11s-test-suite.cc

@@ -21,10 +21,10 @@
 #include "ns3/packet.h"
 #include "ns3/simulator.h"
 #include "ns3/mgt-headers.h"
-#include "../dot11s-mac-header.h"
-#include "../hwmp-rtable.h"
-#include "../peer-link-frame.h"
-#include "../ie-dot11s-peer-management.h"
+#include "ns3/dot11s-mac-header.h"
+#include "ns3/hwmp-rtable.h"
+#include "ns3/peer-link-frame.h"
+#include "ns3/ie-dot11s-peer-management.h"
 
 namespace ns3 {
 namespace dot11s {

src/dot11s/wscript

@@ -0,0 +1,49 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    obj = bld.create_ns3_module('dot11s', ['wifi', 'mesh'])
+    obj.source = [
+        'model/ie-dot11s-beacon-timing.cc',
+        'model/ie-dot11s-configuration.cc',
+        'model/ie-dot11s-id.cc',
+        'model/ie-dot11s-peer-management.cc',
+        'model/ie-dot11s-preq.cc',
+        'model/ie-dot11s-prep.cc',
+        'model/ie-dot11s-perr.cc',
+        'model/ie-dot11s-rann.cc',
+        'model/ie-dot11s-peering-protocol.cc',
+        'model/ie-dot11s-metric-report.cc',
+        'model/dot11s-mac-header.cc',
+        'model/peer-link-frame.cc',
+        'model/peer-link.cc',
+        'model/peer-management-protocol-mac.cc',
+        'model/peer-management-protocol.cc',
+        'model/hwmp-tag.cc',
+        'model/hwmp-rtable.cc',
+        'model/hwmp-protocol-mac.cc',
+        'model/hwmp-protocol.cc',
+        'model/airtime-metric.cc',
+        'test/dot11s-test-suite.cc',
+        'test/pmp-regression.cc',
+        'test/hwmp-reactive-regression.cc',
+        'test/hwmp-proactive-regression.cc',
+        'test/hwmp-simplest-regression.cc',
+        'test/hwmp-target-flags-regression.cc',
+        'test/regression.cc',
+
+        ]
+    headers = bld.new_task_gen('ns3header')
+    headers.module = 'dot11s'
+    headers.source = [
+        'model/hwmp-protocol.h',
+        'model/peer-management-protocol.h',
+        'model/ie-dot11s-beacon-timing.h',
+        'model/ie-dot11s-configuration.h',
+        'model/ie-dot11s-peer-management.h',
+        'model/ie-dot11s-id.h',
+        'model/peer-link.h',
+        'model/dot11s-mac-header.h',
+        'model/peer-link-frame.h',
+        'model/hwmp-rtable.h',
+        'model/ie-dot11s-peering-protocol.h',
+        ]

src/wscript

@@ -42,7 +42,7 @@ all_modules = (
     'devices/uan',
     'spectrum',
     'devices/mesh',   
-    'devices/mesh/dot11s',
+    'dot11s',
     'flame',
     'test',
     'test/perf',