diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-05-02 04:03:49 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-05-02 04:03:49 +0000 |
commit | ec69aa8d273029434ba4f6328875f8464bb724ec (patch) | |
tree | 8b17a1baf7cdd8ffb866c928880a44e8ebbef0bd /epan | |
parent | 0275247b9788e74a97414abc74f6e9f12868ee57 (diff) |
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
Diffstat (limited to 'epan')
-rw-r--r-- | epan/CMakeLists.txt | 6 | ||||
-rw-r--r-- | epan/dissectors/Makefile.common | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-netmon.c (renamed from epan/dissectors/packet-netmon-802_11.c) | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap-defs.h (renamed from epan/dissectors/packet-radiotap-defs.h) | 0 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap-iter.c (renamed from epan/dissectors/packet-radiotap-iter.c) | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap-iter.h (renamed from epan/dissectors/packet-radiotap-iter.h) | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.c (renamed from epan/dissectors/packet-radiotap.c) | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.h (renamed from epan/dissectors/packet-radiotap.h) | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index a01ee8d069..6eec6dc16c 100644 --- 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 29603874ed..7cc85a1dad 100644 --- 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 index 9b2d91ba23..47d71e0543 100644 --- 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 index 68c017cb83..68c017cb83 100644 --- a/epan/dissectors/packet-radiotap-defs.h +++ b/epan/dissectors/packet-ieee80211-radiotap-defs.h diff --git a/epan/dissectors/packet-radiotap-iter.c b/epan/dissectors/packet-ieee80211-radiotap-iter.c index edf22fe753..c24dd6d44a 100644 --- 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 index 38dcfd9d72..34231fa7fb 100644 --- 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 index f646bcdd64..3ec6efdfb3 100644 --- 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 index 914c7b7cf0..da2dde7899 100644 --- 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$ * |