Rename the NetMon 802.11 radio header and radiotap 802.11 radio header

dissector source files to match the "packet-ieee80211-XXX" pattern used
for other 802.11 radio header dissectors.

svn path=/trunk/; revision=42380

diff --git a/capture_info.c b/capture_info.c
index e2506beea2292ba89a8e7a4851bb24a01dcf4f0e..ee9539e36d1c441536ea69f75299f05326d2bded 100644 (file)
--- a/capture_info.c
+++ b/capture_info.c
@@ -52,7 +52,7 @@
 #include <epan/dissectors/packet-sll.h>
 #include <epan/dissectors/packet-tr.h>
 #include <epan/dissectors/packet-ieee80211.h>
-#include <epan/dissectors/packet-radiotap.h>
+#include <epan/dissectors/packet-ieee80211-radiotap.h>
 #include <epan/dissectors/packet-chdlc.h>
 #include <epan/dissectors/packet-ipfc.h>
 #include <epan/dissectors/packet-arcnet.h>

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index a01ee8d069b11f078279fe183e4e435b35bbc479..6eec6dc16ccb45271f367a3b925fe16222a7e4da 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -695,8 +695,11 @@ set(DISSECTOR_SRC
        dissectors/packet-ieee17221.c
        dissectors/packet-ieee80211.c
        dissectors/packet-ieee80211-airopeek.c
+       dissectors/packet-ieee80211-netmon.c
        dissectors/packet-ieee80211-prism.c
        dissectors/packet-ieee80211-radio.c
+       dissectors/packet-ieee80211-radiotap.c
+       dissectors/packet-ieee80211-radiotap-iter.c
        dissectors/packet-ieee80211-wlancap.c
        dissectors/packet-ieee802154.c
        dissectors/packet-ieee8021ah.c
@@ -877,7 +880,6 @@ set(DISSECTOR_SRC
        dissectors/packet-netbios.c
        dissectors/packet-netdump.c
        dissectors/packet-netflow.c
-       dissectors/packet-netmon-802_11.c
        dissectors/packet-netperfmeter.c
        dissectors/packet-netsync.c
        dissectors/packet-nettl.c
@@ -963,8 +965,6 @@ set(DISSECTOR_SRC
        dissectors/packet-quake2.c
        dissectors/packet-quake3.c
        dissectors/packet-quakeworld.c
-       dissectors/packet-radiotap.c
-       dissectors/packet-radiotap-iter.c
        dissectors/packet-radius.c
        dissectors/packet-radius_packetcable.c
        dissectors/packet-raw.c

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 29603874edfa3e102b5cacace29c7ba2cbb7ca3d..7cc85a1dad58fe28e4a3f18d9678c5f511beaf76 100644 (file)
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -614,8 +614,11 @@ DISSECTOR_SRC = \
        packet-ieee17221.c      \
        packet-ieee80211.c      \
        packet-ieee80211-airopeek.c \
+       packet-ieee80211-netmon.c \
        packet-ieee80211-prism.c \
        packet-ieee80211-radio.c \
+       packet-ieee80211-radiotap.c \
+       packet-ieee80211-radiotap-iter.c \
        packet-ieee80211-wlancap.c \
        packet-ieee802154.c     \
        packet-ieee8021ah.c     \
@@ -796,7 +799,6 @@ DISSECTOR_SRC = \
        packet-netbios.c        \
        packet-netdump.c        \
        packet-netflow.c        \
-       packet-netmon-802_11.c  \
        packet-netperfmeter.c   \
        packet-netsync.c        \
        packet-nettl.c          \
@@ -882,8 +884,6 @@ DISSECTOR_SRC = \
        packet-quake2.c         \
        packet-quake3.c         \
        packet-quakeworld.c     \
-       packet-radiotap.c       \
-       packet-radiotap-iter.c  \
        packet-radius.c         \
        packet-radius_packetcable.c     \
        packet-raw.c            \
@@ -1289,6 +1289,9 @@ DISSECTOR_INCLUDES =      \
        packet-idmp.h   \
        packet-idp.h    \
        packet-ieee80211.h      \
+       packet-ieee80211-radiotap.h     \
+       packet-ieee80211-radiotap-iter.h        \
+       packet-ieee80211-radiotap-defs.h        \
        packet-ieee802154.h     \
        packet-ieee8021ah.h     \
        packet-ieee8023.h       \
@@ -1383,9 +1386,6 @@ DISSECTOR_INCLUDES =      \
        packet-q931.h   \
        packet-q932.h   \
        packet-qsig.h   \
-       packet-radiotap.h       \
-       packet-radiotap-iter.h  \
-       packet-radiotap-defs.h  \
        packet-radius.h \
        packet-ranap.h  \
        packet-raw.h    \

diff --git a/epan/dissectors/packet-netmon-802_11.c b/epan/dissectors/packet-ieee80211-netmon.c
similarity index 99%
rename from epan/dissectors/packet-netmon-802_11.c
rename to epan/dissectors/packet-ieee80211-netmon.c
index 9b2d91ba23242588a2278b4b9caa7e47ee39ef31..47d71e0543317a06093a2c2042a676df954c461d 100644 (file)
--- a/epan/dissectors/packet-netmon-802_11.c
+++ b/epan/dissectors/packet-ieee80211-netmon.c
@@ -1,5 +1,5 @@
 /*
- *  packet-netmon-802_11.c
+ *  packet-ieee80211-netmon.c
  *       Decode packets with a Network Monitor 802.11 radio header
  *
  * $Id$

diff --git a/epan/dissectors/packet-radiotap-defs.h b/epan/dissectors/packet-ieee80211-radiotap-defs.h
similarity index 100%
rename from epan/dissectors/packet-radiotap-defs.h
rename to epan/dissectors/packet-ieee80211-radiotap-defs.h

diff --git a/epan/dissectors/packet-radiotap-iter.c b/epan/dissectors/packet-ieee80211-radiotap-iter.c
similarity index 99%
rename from epan/dissectors/packet-radiotap-iter.c
rename to epan/dissectors/packet-ieee80211-radiotap-iter.c
index edf22fe753d102fd32f64a1dbe84851e4ac9ef8e..c24dd6d44a10cb6405ac8ab74506aa9cc1f1aaf9 100644 (file)
--- a/epan/dissectors/packet-radiotap-iter.c
+++ b/epan/dissectors/packet-ieee80211-radiotap-iter.c
@@ -26,7 +26,7 @@
 #define get_unaligned_le16     pletohs
 #define get_unaligned_le32     pletohl
 
-#include "packet-radiotap-iter.h"
+#include "packet-ieee80211-radiotap-iter.h"
 
 /* function prototypes and related defs are in radiotap_iter.h */
 

diff --git a/epan/dissectors/packet-radiotap-iter.h b/epan/dissectors/packet-ieee80211-radiotap-iter.h
similarity index 98%
rename from epan/dissectors/packet-radiotap-iter.h
rename to epan/dissectors/packet-ieee80211-radiotap-iter.h
index 38dcfd9d725118db1a562baba4dc60283da2fbb9..34231fa7fb2dbe29ebdb315c4859c04ccc8a1b9f 100644 (file)
--- a/epan/dissectors/packet-radiotap-iter.h
+++ b/epan/dissectors/packet-ieee80211-radiotap-iter.h
@@ -22,7 +22,7 @@
 #define RADIOTAP_SUPPORT_OVERRIDES
 
 #include <glib.h>
-#include "packet-radiotap-defs.h"
+#include "packet-ieee80211-radiotap-defs.h"
 
 /* Radiotap header iteration
  *   implemented in radiotap.c

diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
similarity index 99%
rename from epan/dissectors/packet-radiotap.c
rename to epan/dissectors/packet-ieee80211-radiotap.c
index f646bcdd64c0081c6f1d616d85c29c0d36e92687..3ec6efdfb308ed1136f50b7b8c01b0c0db0e96fe 100644 (file)
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -1,5 +1,5 @@
 /*
- *  packet-radiotap.c
+ *  packet-ieee80211-radiotap.c
  *     Decode packets with a Radiotap header
  *
  * $Id$
@@ -39,9 +39,9 @@
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include "packet-ieee80211.h"
-#include "packet-radiotap.h"
-#include "packet-radiotap-iter.h"
-#include "packet-radiotap-defs.h"
+#include "packet-ieee80211-radiotap.h"
+#include "packet-ieee80211-radiotap-iter.h"
+#include "packet-ieee80211-radiotap-defs.h"
 
 /* not officially defined (yet) */
 #define IEEE80211_RADIOTAP_F_SHORTGI   0x80

diff --git a/epan/dissectors/packet-radiotap.h b/epan/dissectors/packet-ieee80211-radiotap.h
similarity index 93%
rename from epan/dissectors/packet-radiotap.h
rename to epan/dissectors/packet-ieee80211-radiotap.h
index 914c7b7cf0bf00cd0ce0dcd3b893000859db935d..da2dde7899e92b71cc126a877f3e24515a1d8950 100644 (file)
--- a/epan/dissectors/packet-radiotap.h
+++ b/epan/dissectors/packet-ieee80211-radiotap.h
@@ -1,6 +1,6 @@
 /*
- * packet-radiotap.h
- *     Declarations for packet-radiotap.c
+ * packet-ieee80211-radiotap.h
+ *     Declarations for packet-ieee80211-radiotap.c
  *
  * $Id$
  *