From a9e382bd4548d9e380f428401320cd720ba7d3db Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Wed, 18 Mar 2009 13:35:49 +0300
Subject: [PATCH] Restructured filenames in information elements

---
 ...-element.cc => ie-dot11s-beacon-timing.cc} |  2 +-
 ...ng-element.h => ie-dot11s-beacon-timing.h} |  0
 ...-element.cc => ie-dot11s-configuration.cc} |  2 +-
 ...on-element.h => ie-dot11s-configuration.h} |  0
 ...formation-element.cc => ie-dot11s-perr.cc} |  2 +-
 ...information-element.h => ie-dot11s-perr.h} |  0
 ...formation-element.cc => ie-dot11s-prep.cc} |  2 +-
 ...information-element.h => ie-dot11s-prep.h} |  0
 ...formation-element.cc => ie-dot11s-preq.cc} |  2 +-
 ...information-element.h => ie-dot11s-preq.h} |  0
 ...formation-element.cc => ie-dot11s-rann.cc} |  2 +-
 ...information-element.h => ie-dot11s-rann.h} |  0
 src/devices/mesh/802.11s/wscript              | 24 +++++++++----------
 src/devices/mesh/hwmp-state.h                 |  6 ++---
 src/devices/mesh/mesh-mgt-headers.h           | 13 +++++-----
 src/devices/mesh/mesh-wifi-mac.h              |  2 +-
 src/devices/mesh/mesh-wifi-peer-manager.h     |  2 +-
 17 files changed, 29 insertions(+), 30 deletions(-)
 rename src/devices/mesh/802.11s/{mesh-wifi-beacon-timing-element.cc => ie-dot11s-beacon-timing.cc} (99%)
 rename src/devices/mesh/802.11s/{mesh-wifi-beacon-timing-element.h => ie-dot11s-beacon-timing.h} (100%)
 rename src/devices/mesh/802.11s/{mesh-configuration-element.cc => ie-dot11s-configuration.cc} (98%)
 rename src/devices/mesh/802.11s/{mesh-configuration-element.h => ie-dot11s-configuration.h} (100%)
 rename src/devices/mesh/802.11s/{mesh-wifi-perr-information-element.cc => ie-dot11s-perr.cc} (98%)
 rename src/devices/mesh/802.11s/{mesh-wifi-perr-information-element.h => ie-dot11s-perr.h} (100%)
 rename src/devices/mesh/802.11s/{mesh-wifi-prep-information-element.cc => ie-dot11s-prep.cc} (98%)
 rename src/devices/mesh/802.11s/{mesh-wifi-prep-information-element.h => ie-dot11s-prep.h} (100%)
 rename src/devices/mesh/802.11s/{mesh-wifi-preq-information-element.cc => ie-dot11s-preq.cc} (99%)
 rename src/devices/mesh/802.11s/{mesh-wifi-preq-information-element.h => ie-dot11s-preq.h} (100%)
 rename src/devices/mesh/802.11s/{mesh-wifi-rann-information-element.cc => ie-dot11s-rann.cc} (98%)
 rename src/devices/mesh/802.11s/{mesh-wifi-rann-information-element.h => ie-dot11s-rann.h} (100%)

diff --git a/src/devices/mesh/802.11s/mesh-wifi-beacon-timing-element.cc b/src/devices/mesh/802.11s/ie-dot11s-beacon-timing.cc
similarity index 99%
rename from src/devices/mesh/802.11s/mesh-wifi-beacon-timing-element.cc
rename to src/devices/mesh/802.11s/ie-dot11s-beacon-timing.cc
index 1229bf38f..2697ef258 100644
--- a/src/devices/mesh/802.11s/mesh-wifi-beacon-timing-element.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-beacon-timing.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 namespace ns3 {
 /*******************************************
  * WifiBeaconTimingElementUnit
diff --git a/src/devices/mesh/802.11s/mesh-wifi-beacon-timing-element.h b/src/devices/mesh/802.11s/ie-dot11s-beacon-timing.h
similarity index 100%
rename from src/devices/mesh/802.11s/mesh-wifi-beacon-timing-element.h
rename to src/devices/mesh/802.11s/ie-dot11s-beacon-timing.h
diff --git a/src/devices/mesh/802.11s/mesh-configuration-element.cc b/src/devices/mesh/802.11s/ie-dot11s-configuration.cc
similarity index 98%
rename from src/devices/mesh/802.11s/mesh-configuration-element.cc
rename to src/devices/mesh/802.11s/ie-dot11s-configuration.cc
index e810b4277..7e3aa8b40 100644
--- a/src/devices/mesh/802.11s/mesh-configuration-element.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-configuration.cc
@@ -20,7 +20,7 @@
  */
 
 
-#include "ns3/mesh-configuration-element.h"
+#include "ns3/ie-dot11s-configuration.h"
 #include "ns3/assert.h"
 
 //NS_LOG_COMPONENT_DEFINE ("MeshConfigurationElement");
diff --git a/src/devices/mesh/802.11s/mesh-configuration-element.h b/src/devices/mesh/802.11s/ie-dot11s-configuration.h
similarity index 100%
rename from src/devices/mesh/802.11s/mesh-configuration-element.h
rename to src/devices/mesh/802.11s/ie-dot11s-configuration.h
diff --git a/src/devices/mesh/802.11s/mesh-wifi-perr-information-element.cc b/src/devices/mesh/802.11s/ie-dot11s-perr.cc
similarity index 98%
rename from src/devices/mesh/802.11s/mesh-wifi-perr-information-element.cc
rename to src/devices/mesh/802.11s/ie-dot11s-perr.cc
index a4b18600f..47efb5bb2 100644
--- a/src/devices/mesh/802.11s/mesh-wifi-perr-information-element.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-perr.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-perr-information-element.h"
+#include "ns3/ie-dot11s-perr.h"
 #include "ns3/address-utils.h"
 
 namespace ns3 {
diff --git a/src/devices/mesh/802.11s/mesh-wifi-perr-information-element.h b/src/devices/mesh/802.11s/ie-dot11s-perr.h
similarity index 100%
rename from src/devices/mesh/802.11s/mesh-wifi-perr-information-element.h
rename to src/devices/mesh/802.11s/ie-dot11s-perr.h
diff --git a/src/devices/mesh/802.11s/mesh-wifi-prep-information-element.cc b/src/devices/mesh/802.11s/ie-dot11s-prep.cc
similarity index 98%
rename from src/devices/mesh/802.11s/mesh-wifi-prep-information-element.cc
rename to src/devices/mesh/802.11s/ie-dot11s-prep.cc
index c47fb25cb..7e51b34dd 100644
--- a/src/devices/mesh/802.11s/mesh-wifi-prep-information-element.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-prep.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-prep-information-element.h"
+#include "ns3/ie-dot11s-prep.h"
 #include "ns3/address-utils.h"
 #include "ns3/assert.h"
 namespace ns3 {
diff --git a/src/devices/mesh/802.11s/mesh-wifi-prep-information-element.h b/src/devices/mesh/802.11s/ie-dot11s-prep.h
similarity index 100%
rename from src/devices/mesh/802.11s/mesh-wifi-prep-information-element.h
rename to src/devices/mesh/802.11s/ie-dot11s-prep.h
diff --git a/src/devices/mesh/802.11s/mesh-wifi-preq-information-element.cc b/src/devices/mesh/802.11s/ie-dot11s-preq.cc
similarity index 99%
rename from src/devices/mesh/802.11s/mesh-wifi-preq-information-element.cc
rename to src/devices/mesh/802.11s/ie-dot11s-preq.cc
index 839bd1a51..3ac2b80b2 100644
--- a/src/devices/mesh/802.11s/mesh-wifi-preq-information-element.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-preq.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-preq-information-element.h"
+#include "ns3/ie-dot11s-preq.h"
 #include "ns3/address-utils.h"
 #include "ns3/assert.h"
 
diff --git a/src/devices/mesh/802.11s/mesh-wifi-preq-information-element.h b/src/devices/mesh/802.11s/ie-dot11s-preq.h
similarity index 100%
rename from src/devices/mesh/802.11s/mesh-wifi-preq-information-element.h
rename to src/devices/mesh/802.11s/ie-dot11s-preq.h
diff --git a/src/devices/mesh/802.11s/mesh-wifi-rann-information-element.cc b/src/devices/mesh/802.11s/ie-dot11s-rann.cc
similarity index 98%
rename from src/devices/mesh/802.11s/mesh-wifi-rann-information-element.cc
rename to src/devices/mesh/802.11s/ie-dot11s-rann.cc
index 2d3c0de9c..65caf6e4b 100644
--- a/src/devices/mesh/802.11s/mesh-wifi-rann-information-element.cc
+++ b/src/devices/mesh/802.11s/ie-dot11s-rann.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include "ns3/mesh-wifi-rann-information-element.h"
+#include "ns3/ie-dot11s-rann.h"
 #include "ns3/assert.h"
 #include "ns3/address-utils.h"
 
diff --git a/src/devices/mesh/802.11s/mesh-wifi-rann-information-element.h b/src/devices/mesh/802.11s/ie-dot11s-rann.h
similarity index 100%
rename from src/devices/mesh/802.11s/mesh-wifi-rann-information-element.h
rename to src/devices/mesh/802.11s/ie-dot11s-rann.h
diff --git a/src/devices/mesh/802.11s/wscript b/src/devices/mesh/802.11s/wscript
index fec1afc0d..590ce8ed5 100644
--- a/src/devices/mesh/802.11s/wscript
+++ b/src/devices/mesh/802.11s/wscript
@@ -4,23 +4,23 @@ def build(bld):
     obj = bld.create_ns3_module('802.11s', ['wifi'])
     obj.source = [
         'wifi-information-element.cc',
-        'mesh-wifi-beacon-timing-element.cc',
-        'mesh-configuration-element.cc',
-        'mesh-wifi-preq-information-element.cc',
-        'mesh-wifi-prep-information-element.cc',
-        'mesh-wifi-perr-information-element.cc',
-        'mesh-wifi-rann-information-element.cc',
+        'ie-dot11s-beacon-timing.cc',
+        'ie-dot11s-configuration.cc',
+        'ie-dot11s-preq.cc',
+        'ie-dot11s-prep.cc',
+        'ie-dot11s-perr.cc',
+        'ie-dot11s-rann.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = '802.11s'
     headers.source = [
         'wifi-information-element.h',
-        'mesh-wifi-beacon-timing-element.h',
-        'mesh-configuration-element.h',
-        'mesh-wifi-preq-information-element.h',
-        'mesh-wifi-prep-information-element.h',
-        'mesh-wifi-perr-information-element.h',
-        'mesh-wifi-rann-information-element.h',
+        'ie-dot11s-beacon-timing.h',
+        'ie-dot11s-configuration.h',
+        'ie-dot11s-preq.h',
+        'ie-dot11s-prep.h',
+        'ie-dot11s-perr.h',
+        'ie-dot11s-rann.h',
         ]
 
 #    obj = bld.create_ns3_program('wifi-phy-test',
diff --git a/src/devices/mesh/hwmp-state.h b/src/devices/mesh/hwmp-state.h
index aea16ac2a..422758c72 100644
--- a/src/devices/mesh/hwmp-state.h
+++ b/src/devices/mesh/hwmp-state.h
@@ -28,9 +28,9 @@
 #include "ns3/packet.h"
 #include "ns3/wifi-net-device.h"
 #include "ns3/mesh-wifi-mac.h"
-#include "ns3/mesh-wifi-preq-information-element.h"
-#include "ns3/mesh-wifi-prep-information-element.h"
-#include "ns3/mesh-wifi-perr-information-element.h"
+#include "ns3/ie-dot11s-preq.h"
+#include "ns3/ie-dot11s-prep.h"
+#include "ns3/ie-dot11s-perr.h"
 #include "ns3/dot11s-parameters.h"
 namespace ns3 {
 /**
diff --git a/src/devices/mesh/mesh-mgt-headers.h b/src/devices/mesh/mesh-mgt-headers.h
index 3034803a5..1219ff084 100644
--- a/src/devices/mesh/mesh-mgt-headers.h
+++ b/src/devices/mesh/mesh-mgt-headers.h
@@ -29,13 +29,12 @@
 #include "ns3/status-code.h"
 #include "ns3/dot11s-peer-management-element.h"
 #include "ns3/supported-rates.h"
-#include "ns3/mesh-configuration-element.h"
-#include "ns3/mesh-wifi-preq-information-element.h"
-#include "ns3/mesh-wifi-prep-information-element.h"
-#include "ns3/mesh-wifi-perr-information-element.h"
-#include "ns3/mesh-wifi-rann-information-element.h"
-#include "ns3/mesh-configuration-element.h"
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-preq.h"
+#include "ns3/ie-dot11s-prep.h"
+#include "ns3/ie-dot11s-perr.h"
+#include "ns3/ie-dot11s-rann.h"
+#include "ns3/ie-dot11s-configuration.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/mgt-headers.h"
 #include "ns3/ssid.h"
 
diff --git a/src/devices/mesh/mesh-wifi-mac.h b/src/devices/mesh/mesh-wifi-mac.h
index beafe3937..770ee286a 100644
--- a/src/devices/mesh/mesh-wifi-mac.h
+++ b/src/devices/mesh/mesh-wifi-mac.h
@@ -31,7 +31,7 @@
 #include "ns3/callback.h"
 #include "ns3/packet.h"
 #include "ns3/nstime.h"
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/wifi-remote-station-manager.h"
 #include "ns3/mesh-wifi-peer-manager.h"
 #include "ns3/wifi-mac.h"
diff --git a/src/devices/mesh/mesh-wifi-peer-manager.h b/src/devices/mesh/mesh-wifi-peer-manager.h
index 7dcfdcdd8..408421887 100644
--- a/src/devices/mesh/mesh-wifi-peer-manager.h
+++ b/src/devices/mesh/mesh-wifi-peer-manager.h
@@ -30,7 +30,7 @@
 #include "ns3/uinteger.h"
 #include "ns3/wifi-net-device.h"
 #include "ns3/dot11s-peer-management-element.h"
-#include "ns3/mesh-wifi-beacon-timing-element.h"
+#include "ns3/ie-dot11s-beacon-timing.h"
 #include "ns3/mesh-wifi-mac.h"
 
 #include <list>