From 2a60f5c62578c71d35ae81a3e53b0375c2d9902e Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Thu, 3 Mar 2011 15:36:54 -0800 Subject: [PATCH] Modularize dot11s module and move it to src --- src/devices/mesh/dot11s/wscript | 45 ---------------- .../dot11s => dot11s/model}/airtime-metric.cc | 0 .../dot11s => dot11s/model}/airtime-metric.h | 0 .../model}/dot11s-mac-header.cc | 0 .../model}/dot11s-mac-header.h | 0 .../mesh/dot11s => dot11s/model}/dot11s.h | 0 .../model}/hwmp-protocol-mac.cc | 0 .../model}/hwmp-protocol-mac.h | 0 .../dot11s => dot11s/model}/hwmp-protocol.cc | 0 .../dot11s => dot11s/model}/hwmp-protocol.h | 0 .../dot11s => dot11s/model}/hwmp-rtable.cc | 0 .../dot11s => dot11s/model}/hwmp-rtable.h | 0 .../mesh/dot11s => dot11s/model}/hwmp-tag.cc | 0 .../mesh/dot11s => dot11s/model}/hwmp-tag.h | 0 .../model}/ie-dot11s-beacon-timing.cc | 0 .../model}/ie-dot11s-beacon-timing.h | 0 .../model}/ie-dot11s-configuration.cc | 0 .../model}/ie-dot11s-configuration.h | 0 .../dot11s => dot11s/model}/ie-dot11s-id.cc | 0 .../dot11s => dot11s/model}/ie-dot11s-id.h | 0 .../model}/ie-dot11s-metric-report.cc | 0 .../model}/ie-dot11s-metric-report.h | 0 .../model}/ie-dot11s-peer-management.cc | 0 .../model}/ie-dot11s-peer-management.h | 0 .../model}/ie-dot11s-peering-protocol.cc | 0 .../model}/ie-dot11s-peering-protocol.h | 0 .../dot11s => dot11s/model}/ie-dot11s-perr.cc | 0 .../dot11s => dot11s/model}/ie-dot11s-perr.h | 0 .../dot11s => dot11s/model}/ie-dot11s-prep.cc | 0 .../dot11s => dot11s/model}/ie-dot11s-prep.h | 0 .../dot11s => dot11s/model}/ie-dot11s-preq.cc | 0 .../dot11s => dot11s/model}/ie-dot11s-preq.h | 0 .../dot11s => dot11s/model}/ie-dot11s-rann.cc | 0 .../dot11s => dot11s/model}/ie-dot11s-rann.h | 0 .../model}/peer-link-frame.cc | 0 .../dot11s => dot11s/model}/peer-link-frame.h | 0 .../mesh/dot11s => dot11s/model}/peer-link.cc | 0 .../mesh/dot11s => dot11s/model}/peer-link.h | 0 .../model}/peer-management-protocol-mac.cc | 0 .../model}/peer-management-protocol-mac.h | 0 .../model}/peer-management-protocol.cc | 0 .../model}/peer-management-protocol.h | 0 .../dot11s/test/dot11s-test-suite.cc | 8 +-- .../hwmp-proactive-regression-test-0-1.pcap | Bin .../hwmp-proactive-regression-test-1-1.pcap | Bin .../hwmp-proactive-regression-test-2-1.pcap | Bin .../hwmp-proactive-regression-test-3-1.pcap | Bin .../hwmp-proactive-regression-test-4-1.pcap | Bin .../dot11s/test/hwmp-proactive-regression.cc | 0 .../dot11s/test/hwmp-proactive-regression.h | 0 .../hwmp-reactive-regression-test-0-1.pcap | Bin .../hwmp-reactive-regression-test-1-1.pcap | Bin .../hwmp-reactive-regression-test-2-1.pcap | Bin .../hwmp-reactive-regression-test-3-1.pcap | Bin .../hwmp-reactive-regression-test-4-1.pcap | Bin .../hwmp-reactive-regression-test-5-1.pcap | Bin .../dot11s/test/hwmp-reactive-regression.cc | 0 .../dot11s/test/hwmp-reactive-regression.h | 0 .../hwmp-simplest-regression-test-0-1.pcap | Bin .../hwmp-simplest-regression-test-1-1.pcap | Bin .../dot11s/test/hwmp-simplest-regression.cc | 0 .../dot11s/test/hwmp-simplest-regression.h | 0 ...hwmp-target-flags-regression-test-0-1.pcap | Bin ...hwmp-target-flags-regression-test-1-1.pcap | Bin ...hwmp-target-flags-regression-test-2-1.pcap | Bin ...hwmp-target-flags-regression-test-3-1.pcap | Bin .../test/hwmp-target-flags-regression.cc | 0 .../test/hwmp-target-flags-regression.h | 0 .../dot11s/test/pmp-regression-test-0-1.pcap | Bin .../dot11s/test/pmp-regression-test-1-1.pcap | Bin .../mesh => }/dot11s/test/pmp-regression.cc | 0 .../mesh => }/dot11s/test/pmp-regression.h | 0 .../mesh => }/dot11s/test/regression.cc | 0 src/{devices/mesh => }/dot11s/waf | 0 src/dot11s/wscript | 49 ++++++++++++++++++ src/wscript | 2 +- 76 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 src/devices/mesh/dot11s/wscript rename src/{devices/mesh/dot11s => dot11s/model}/airtime-metric.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/airtime-metric.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/dot11s-mac-header.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/dot11s-mac-header.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/dot11s.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-protocol-mac.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-protocol-mac.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-protocol.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-protocol.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-rtable.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-rtable.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-tag.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/hwmp-tag.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-beacon-timing.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-beacon-timing.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-configuration.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-configuration.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-id.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-id.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-metric-report.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-metric-report.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-peer-management.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-peer-management.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-peering-protocol.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-peering-protocol.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-perr.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-perr.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-prep.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-prep.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-preq.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-preq.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-rann.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/ie-dot11s-rann.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-link-frame.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-link-frame.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-link.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-link.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-management-protocol-mac.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-management-protocol-mac.h (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-management-protocol.cc (100%) rename src/{devices/mesh/dot11s => dot11s/model}/peer-management-protocol.h (100%) rename src/{devices/mesh => }/dot11s/test/dot11s-test-suite.cc (98%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression-test-0-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression-test-1-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression-test-2-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression-test-3-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression-test-4-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression.cc (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-proactive-regression.h (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression-test-0-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression-test-1-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression-test-2-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression-test-3-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression-test-4-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression-test-5-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression.cc (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-reactive-regression.h (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-simplest-regression-test-0-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-simplest-regression-test-1-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-simplest-regression.cc (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-simplest-regression.h (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-target-flags-regression.cc (100%) rename src/{devices/mesh => }/dot11s/test/hwmp-target-flags-regression.h (100%) rename src/{devices/mesh => }/dot11s/test/pmp-regression-test-0-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/pmp-regression-test-1-1.pcap (100%) rename src/{devices/mesh => }/dot11s/test/pmp-regression.cc (100%) rename src/{devices/mesh => }/dot11s/test/pmp-regression.h (100%) rename src/{devices/mesh => }/dot11s/test/regression.cc (100%) rename src/{devices/mesh => }/dot11s/waf (100%) create mode 100644 src/dot11s/wscript diff --git a/src/devices/mesh/dot11s/wscript b/src/devices/mesh/dot11s/wscript deleted file mode 100644 index b40c2f038..000000000 --- a/src/devices/mesh/dot11s/wscript +++ /dev/null @@ -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', - ] diff --git a/src/devices/mesh/dot11s/airtime-metric.cc b/src/dot11s/model/airtime-metric.cc similarity index 100% rename from src/devices/mesh/dot11s/airtime-metric.cc rename to src/dot11s/model/airtime-metric.cc diff --git a/src/devices/mesh/dot11s/airtime-metric.h b/src/dot11s/model/airtime-metric.h similarity index 100% rename from src/devices/mesh/dot11s/airtime-metric.h rename to src/dot11s/model/airtime-metric.h diff --git a/src/devices/mesh/dot11s/dot11s-mac-header.cc b/src/dot11s/model/dot11s-mac-header.cc similarity index 100% rename from src/devices/mesh/dot11s/dot11s-mac-header.cc rename to src/dot11s/model/dot11s-mac-header.cc diff --git a/src/devices/mesh/dot11s/dot11s-mac-header.h b/src/dot11s/model/dot11s-mac-header.h similarity index 100% rename from src/devices/mesh/dot11s/dot11s-mac-header.h rename to src/dot11s/model/dot11s-mac-header.h diff --git a/src/devices/mesh/dot11s/dot11s.h b/src/dot11s/model/dot11s.h similarity index 100% rename from src/devices/mesh/dot11s/dot11s.h rename to src/dot11s/model/dot11s.h diff --git a/src/devices/mesh/dot11s/hwmp-protocol-mac.cc b/src/dot11s/model/hwmp-protocol-mac.cc similarity index 100% rename from src/devices/mesh/dot11s/hwmp-protocol-mac.cc rename to src/dot11s/model/hwmp-protocol-mac.cc diff --git a/src/devices/mesh/dot11s/hwmp-protocol-mac.h b/src/dot11s/model/hwmp-protocol-mac.h similarity index 100% rename from src/devices/mesh/dot11s/hwmp-protocol-mac.h rename to src/dot11s/model/hwmp-protocol-mac.h diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/dot11s/model/hwmp-protocol.cc similarity index 100% rename from src/devices/mesh/dot11s/hwmp-protocol.cc rename to src/dot11s/model/hwmp-protocol.cc diff --git a/src/devices/mesh/dot11s/hwmp-protocol.h b/src/dot11s/model/hwmp-protocol.h similarity index 100% rename from src/devices/mesh/dot11s/hwmp-protocol.h rename to src/dot11s/model/hwmp-protocol.h diff --git a/src/devices/mesh/dot11s/hwmp-rtable.cc b/src/dot11s/model/hwmp-rtable.cc similarity index 100% rename from src/devices/mesh/dot11s/hwmp-rtable.cc rename to src/dot11s/model/hwmp-rtable.cc diff --git a/src/devices/mesh/dot11s/hwmp-rtable.h b/src/dot11s/model/hwmp-rtable.h similarity index 100% rename from src/devices/mesh/dot11s/hwmp-rtable.h rename to src/dot11s/model/hwmp-rtable.h diff --git a/src/devices/mesh/dot11s/hwmp-tag.cc b/src/dot11s/model/hwmp-tag.cc similarity index 100% rename from src/devices/mesh/dot11s/hwmp-tag.cc rename to src/dot11s/model/hwmp-tag.cc diff --git a/src/devices/mesh/dot11s/hwmp-tag.h b/src/dot11s/model/hwmp-tag.h similarity index 100% rename from src/devices/mesh/dot11s/hwmp-tag.h rename to src/dot11s/model/hwmp-tag.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc b/src/dot11s/model/ie-dot11s-beacon-timing.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc rename to src/dot11s/model/ie-dot11s-beacon-timing.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.h b/src/dot11s/model/ie-dot11s-beacon-timing.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-beacon-timing.h rename to src/dot11s/model/ie-dot11s-beacon-timing.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-configuration.cc b/src/dot11s/model/ie-dot11s-configuration.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-configuration.cc rename to src/dot11s/model/ie-dot11s-configuration.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-configuration.h b/src/dot11s/model/ie-dot11s-configuration.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-configuration.h rename to src/dot11s/model/ie-dot11s-configuration.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-id.cc b/src/dot11s/model/ie-dot11s-id.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-id.cc rename to src/dot11s/model/ie-dot11s-id.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-id.h b/src/dot11s/model/ie-dot11s-id.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-id.h rename to src/dot11s/model/ie-dot11s-id.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-metric-report.cc b/src/dot11s/model/ie-dot11s-metric-report.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-metric-report.cc rename to src/dot11s/model/ie-dot11s-metric-report.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-metric-report.h b/src/dot11s/model/ie-dot11s-metric-report.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-metric-report.h rename to src/dot11s/model/ie-dot11s-metric-report.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc b/src/dot11s/model/ie-dot11s-peer-management.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-peer-management.cc rename to src/dot11s/model/ie-dot11s-peer-management.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-peer-management.h b/src/dot11s/model/ie-dot11s-peer-management.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-peer-management.h rename to src/dot11s/model/ie-dot11s-peer-management.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-peering-protocol.cc b/src/dot11s/model/ie-dot11s-peering-protocol.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-peering-protocol.cc rename to src/dot11s/model/ie-dot11s-peering-protocol.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-peering-protocol.h b/src/dot11s/model/ie-dot11s-peering-protocol.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-peering-protocol.h rename to src/dot11s/model/ie-dot11s-peering-protocol.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-perr.cc b/src/dot11s/model/ie-dot11s-perr.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-perr.cc rename to src/dot11s/model/ie-dot11s-perr.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-perr.h b/src/dot11s/model/ie-dot11s-perr.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-perr.h rename to src/dot11s/model/ie-dot11s-perr.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-prep.cc b/src/dot11s/model/ie-dot11s-prep.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-prep.cc rename to src/dot11s/model/ie-dot11s-prep.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-prep.h b/src/dot11s/model/ie-dot11s-prep.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-prep.h rename to src/dot11s/model/ie-dot11s-prep.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-preq.cc b/src/dot11s/model/ie-dot11s-preq.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-preq.cc rename to src/dot11s/model/ie-dot11s-preq.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-preq.h b/src/dot11s/model/ie-dot11s-preq.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-preq.h rename to src/dot11s/model/ie-dot11s-preq.h diff --git a/src/devices/mesh/dot11s/ie-dot11s-rann.cc b/src/dot11s/model/ie-dot11s-rann.cc similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-rann.cc rename to src/dot11s/model/ie-dot11s-rann.cc diff --git a/src/devices/mesh/dot11s/ie-dot11s-rann.h b/src/dot11s/model/ie-dot11s-rann.h similarity index 100% rename from src/devices/mesh/dot11s/ie-dot11s-rann.h rename to src/dot11s/model/ie-dot11s-rann.h diff --git a/src/devices/mesh/dot11s/peer-link-frame.cc b/src/dot11s/model/peer-link-frame.cc similarity index 100% rename from src/devices/mesh/dot11s/peer-link-frame.cc rename to src/dot11s/model/peer-link-frame.cc diff --git a/src/devices/mesh/dot11s/peer-link-frame.h b/src/dot11s/model/peer-link-frame.h similarity index 100% rename from src/devices/mesh/dot11s/peer-link-frame.h rename to src/dot11s/model/peer-link-frame.h diff --git a/src/devices/mesh/dot11s/peer-link.cc b/src/dot11s/model/peer-link.cc similarity index 100% rename from src/devices/mesh/dot11s/peer-link.cc rename to src/dot11s/model/peer-link.cc diff --git a/src/devices/mesh/dot11s/peer-link.h b/src/dot11s/model/peer-link.h similarity index 100% rename from src/devices/mesh/dot11s/peer-link.h rename to src/dot11s/model/peer-link.h diff --git a/src/devices/mesh/dot11s/peer-management-protocol-mac.cc b/src/dot11s/model/peer-management-protocol-mac.cc similarity index 100% rename from src/devices/mesh/dot11s/peer-management-protocol-mac.cc rename to src/dot11s/model/peer-management-protocol-mac.cc diff --git a/src/devices/mesh/dot11s/peer-management-protocol-mac.h b/src/dot11s/model/peer-management-protocol-mac.h similarity index 100% rename from src/devices/mesh/dot11s/peer-management-protocol-mac.h rename to src/dot11s/model/peer-management-protocol-mac.h diff --git a/src/devices/mesh/dot11s/peer-management-protocol.cc b/src/dot11s/model/peer-management-protocol.cc similarity index 100% rename from src/devices/mesh/dot11s/peer-management-protocol.cc rename to src/dot11s/model/peer-management-protocol.cc diff --git a/src/devices/mesh/dot11s/peer-management-protocol.h b/src/dot11s/model/peer-management-protocol.h similarity index 100% rename from src/devices/mesh/dot11s/peer-management-protocol.h rename to src/dot11s/model/peer-management-protocol.h diff --git a/src/devices/mesh/dot11s/test/dot11s-test-suite.cc b/src/dot11s/test/dot11s-test-suite.cc similarity index 98% rename from src/devices/mesh/dot11s/test/dot11s-test-suite.cc rename to src/dot11s/test/dot11s-test-suite.cc index 0d2030533..e0dce3249 100644 --- a/src/devices/mesh/dot11s/test/dot11s-test-suite.cc +++ b/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 { diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap b/src/dot11s/test/hwmp-proactive-regression-test-0-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap rename to src/dot11s/test/hwmp-proactive-regression-test-0-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap b/src/dot11s/test/hwmp-proactive-regression-test-1-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap rename to src/dot11s/test/hwmp-proactive-regression-test-1-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap b/src/dot11s/test/hwmp-proactive-regression-test-2-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap rename to src/dot11s/test/hwmp-proactive-regression-test-2-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap b/src/dot11s/test/hwmp-proactive-regression-test-3-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap rename to src/dot11s/test/hwmp-proactive-regression-test-3-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap b/src/dot11s/test/hwmp-proactive-regression-test-4-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap rename to src/dot11s/test/hwmp-proactive-regression-test-4-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc b/src/dot11s/test/hwmp-proactive-regression.cc similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc rename to src/dot11s/test/hwmp-proactive-regression.cc diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression.h b/src/dot11s/test/hwmp-proactive-regression.h similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-proactive-regression.h rename to src/dot11s/test/hwmp-proactive-regression.h diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap b/src/dot11s/test/hwmp-reactive-regression-test-0-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap rename to src/dot11s/test/hwmp-reactive-regression-test-0-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap b/src/dot11s/test/hwmp-reactive-regression-test-1-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap rename to src/dot11s/test/hwmp-reactive-regression-test-1-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap b/src/dot11s/test/hwmp-reactive-regression-test-2-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap rename to src/dot11s/test/hwmp-reactive-regression-test-2-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap b/src/dot11s/test/hwmp-reactive-regression-test-3-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap rename to src/dot11s/test/hwmp-reactive-regression-test-3-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap b/src/dot11s/test/hwmp-reactive-regression-test-4-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap rename to src/dot11s/test/hwmp-reactive-regression-test-4-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap b/src/dot11s/test/hwmp-reactive-regression-test-5-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap rename to src/dot11s/test/hwmp-reactive-regression-test-5-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc b/src/dot11s/test/hwmp-reactive-regression.cc similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc rename to src/dot11s/test/hwmp-reactive-regression.cc diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression.h b/src/dot11s/test/hwmp-reactive-regression.h similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-reactive-regression.h rename to src/dot11s/test/hwmp-reactive-regression.h diff --git a/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap b/src/dot11s/test/hwmp-simplest-regression-test-0-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap rename to src/dot11s/test/hwmp-simplest-regression-test-0-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap b/src/dot11s/test/hwmp-simplest-regression-test-1-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap rename to src/dot11s/test/hwmp-simplest-regression-test-1-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-simplest-regression.cc b/src/dot11s/test/hwmp-simplest-regression.cc similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-simplest-regression.cc rename to src/dot11s/test/hwmp-simplest-regression.cc diff --git a/src/devices/mesh/dot11s/test/hwmp-simplest-regression.h b/src/dot11s/test/hwmp-simplest-regression.h similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-simplest-regression.h rename to src/dot11s/test/hwmp-simplest-regression.h diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap b/src/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap rename to src/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap b/src/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap rename to src/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap b/src/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap rename to src/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap b/src/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap rename to src/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc b/src/dot11s/test/hwmp-target-flags-regression.cc similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc rename to src/dot11s/test/hwmp-target-flags-regression.cc diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.h b/src/dot11s/test/hwmp-target-flags-regression.h similarity index 100% rename from src/devices/mesh/dot11s/test/hwmp-target-flags-regression.h rename to src/dot11s/test/hwmp-target-flags-regression.h diff --git a/src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap b/src/dot11s/test/pmp-regression-test-0-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap rename to src/dot11s/test/pmp-regression-test-0-1.pcap diff --git a/src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap b/src/dot11s/test/pmp-regression-test-1-1.pcap similarity index 100% rename from src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap rename to src/dot11s/test/pmp-regression-test-1-1.pcap diff --git a/src/devices/mesh/dot11s/test/pmp-regression.cc b/src/dot11s/test/pmp-regression.cc similarity index 100% rename from src/devices/mesh/dot11s/test/pmp-regression.cc rename to src/dot11s/test/pmp-regression.cc diff --git a/src/devices/mesh/dot11s/test/pmp-regression.h b/src/dot11s/test/pmp-regression.h similarity index 100% rename from src/devices/mesh/dot11s/test/pmp-regression.h rename to src/dot11s/test/pmp-regression.h diff --git a/src/devices/mesh/dot11s/test/regression.cc b/src/dot11s/test/regression.cc similarity index 100% rename from src/devices/mesh/dot11s/test/regression.cc rename to src/dot11s/test/regression.cc diff --git a/src/devices/mesh/dot11s/waf b/src/dot11s/waf similarity index 100% rename from src/devices/mesh/dot11s/waf rename to src/dot11s/waf diff --git a/src/dot11s/wscript b/src/dot11s/wscript new file mode 100644 index 000000000..9edd1695b --- /dev/null +++ b/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', + ] diff --git a/src/wscript b/src/wscript index 9f2b00a7b..f44b16624 100644 --- a/src/wscript +++ b/src/wscript @@ -42,7 +42,7 @@ all_modules = ( 'devices/uan', 'spectrum', 'devices/mesh', - 'devices/mesh/dot11s', + 'dot11s', 'flame', 'test', 'test/perf',