diff options
-rw-r--r-- | capture_info.c | 6 | ||||
-rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
-rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-airopeek.c | 141 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-prism.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee80211-wlancap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-netmon-802_11.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-radiotap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-tzsp.c | 8 | ||||
-rw-r--r-- | wiretap/etherpeek.c | 81 | ||||
-rw-r--r-- | wiretap/netmon.c | 4 | ||||
-rw-r--r-- | wiretap/pcap-common.c | 12 | ||||
-rw-r--r-- | wiretap/wtap.c | 19 | ||||
-rw-r--r-- | wiretap/wtap.h | 9 |
14 files changed, 184 insertions, 106 deletions
diff --git a/capture_info.c b/capture_info.c index 48102d9474..e2506beea2 100644 --- a/capture_info.c +++ b/capture_info.c @@ -286,7 +286,7 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd, case WTAP_ENCAP_FDDI_BITSWAPPED: capture_fddi(pd, caplen, counts); break; - case WTAP_ENCAP_PRISM_HEADER: + case WTAP_ENCAP_IEEE_802_11_PRISM: capture_prism(pd, 0, caplen, counts); break; case WTAP_ENCAP_TOKEN_RING: @@ -311,10 +311,10 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd, case WTAP_ENCAP_IEEE_802_11_WITH_RADIO: capture_ieee80211(pd, 0, caplen, counts); break; - case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP: + case WTAP_ENCAP_IEEE_802_11_RADIOTAP: capture_radiotap(pd, 0, caplen, counts); break; - case WTAP_ENCAP_IEEE_802_11_WLAN_AVS: + case WTAP_ENCAP_IEEE_802_11_AVS: capture_wlancap(pd, 0, caplen, counts); break; case WTAP_ENCAP_CHDLC: diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 7ddeb7494d..a01ee8d069 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -694,6 +694,7 @@ set(DISSECTOR_SRC dissectors/packet-ieee1722.c dissectors/packet-ieee17221.c dissectors/packet-ieee80211.c + dissectors/packet-ieee80211-airopeek.c dissectors/packet-ieee80211-prism.c dissectors/packet-ieee80211-radio.c dissectors/packet-ieee80211-wlancap.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 0a88228afa..29603874ed 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -613,6 +613,7 @@ DISSECTOR_SRC = \ packet-ieee1722.c \ packet-ieee17221.c \ packet-ieee80211.c \ + packet-ieee80211-airopeek.c \ packet-ieee80211-prism.c \ packet-ieee80211-radio.c \ packet-ieee80211-wlancap.c \ diff --git a/epan/dissectors/packet-ieee80211-airopeek.c b/epan/dissectors/packet-ieee80211-airopeek.c new file mode 100644 index 0000000000..f9e0179712 --- /dev/null +++ b/epan/dissectors/packet-ieee80211-airopeek.c @@ -0,0 +1,141 @@ +/* packet-ieee80211-airopeek.c + * Routines for pre-V9 WildPackets AiroPeek header dissection + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <epan/packet.h> +#include "packet-ieee80211.h" + +static dissector_handle_t ieee80211_handle; + +static int proto_airopeek = -1; + +static int hf_data_rate = -1; +static int hf_channel = -1; +static int hf_signal_strength = -1; + +static gint ett_airopeek = -1; + +static void +dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + proto_tree *airopeek_tree = NULL; + proto_item *ti; + guint8 data_rate; + guint8 signal_level; + tvbuff_t *next_tvb; + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AiroPeek"); + col_clear(pinfo->cinfo, COL_INFO); + + /* Dissect the header */ + if (tree) { + ti = proto_tree_add_item(tree, proto_airopeek, tvb, 0, 4, ENC_NA); + airopeek_tree = proto_item_add_subtree(ti, ett_airopeek); + } + + data_rate = tvb_get_guint8(tvb, 0); + /* Add the radio information to the column information */ + col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%u.%u", + data_rate / 2, + data_rate & 1 ? 5 : 0); + if (tree) { + proto_tree_add_uint64_format(airopeek_tree, hf_data_rate, tvb, 0, 1, + (guint64)data_rate * 500000, + "Data Rate: %u.%u Mb/s", + data_rate / 2, + data_rate & 1 ? 5 : 0); + } + + if (tree) + proto_tree_add_item(airopeek_tree, hf_channel, tvb, 1, 1, ENC_NA); + + signal_level = tvb_get_guint8(tvb, 2); + /* XX - this is a percentage, not a dBm or normalized or raw RSSI */ + col_add_fstr(pinfo->cinfo, COL_RSSI, "%u", signal_level); + if (tree) { + proto_tree_add_uint_format(airopeek_tree, hf_signal_strength, tvb, 2, 1, + signal_level, + "Signal Strength: %u%%", + signal_level); + } + + /* dissect the 802.11 header next */ + pinfo->current_proto = "IEEE 802.11"; + next_tvb = tvb_new_subset_remaining(tvb, 4); + call_dissector(ieee80211_handle, next_tvb, pinfo, tree); +} + +void proto_register_ieee80211_airopeek(void) +{ + static hf_register_info hf[] = { + {&hf_data_rate, + {"Data Rate", "airopeek.data_rate", FT_UINT64, BASE_DEC, NULL, 0, + "Data rate (b/s)", HFILL }}, + + {&hf_channel, + {"Channel", "airopeek.channel", FT_UINT8, BASE_DEC, NULL, 0, + "802.11 channel number that this frame was sent/received on", HFILL }}, + + {&hf_signal_strength, + {"Signal Strength", "airopeek.signal_strength", FT_UINT8, BASE_DEC, NULL, 0, + "Signal strength (Percentage)", HFILL }} + }; + + static gint *tree_array[] = { + &ett_airopeek + }; + + proto_airopeek = proto_register_protocol("AiroPeek 802.11 radio information", + "AiroPeek", + "airopeek"); + proto_register_field_array(proto_airopeek, hf, array_length(hf)); + proto_register_subtree_array(tree_array, array_length(tree_array)); +} + +void proto_reg_handoff_ieee80211_airopeek(void) +{ + dissector_handle_t airopeek_handle; + + /* Register handoff to airopeek-header dissectors */ + airopeek_handle = create_dissector_handle(dissect_airopeek, proto_airopeek); + dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_AIROPEEK, + airopeek_handle); + ieee80211_handle = find_dissector("wlan"); +} + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index 810d073e50..fbc1168445 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -460,7 +460,7 @@ void proto_reg_handoff_ieee80211_prism(void) dissector_handle_t prism_handle; prism_handle = create_dissector_handle(dissect_prism, proto_prism); - dissector_add_uint("wtap_encap", WTAP_ENCAP_PRISM_HEADER, prism_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_PRISM, prism_handle); ieee80211_handle = find_dissector("wlan"); wlancap_handle = find_dissector("wlancap"); } diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index 9c8e16613c..4aaf3faaea 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -654,7 +654,7 @@ void proto_register_ieee80211_wlancap(void) register_dissector("wlancap", dissect_wlancap, proto_wlancap); wlancap_handle = create_dissector_handle(dissect_wlancap, proto_wlancap); - dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_AVS, + dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_AVS, wlancap_handle); proto_register_subtree_array(tree_array, array_length(tree_array)); } diff --git a/epan/dissectors/packet-netmon-802_11.c b/epan/dissectors/packet-netmon-802_11.c index dc47c75b7d..9b2d91ba23 100644 --- a/epan/dissectors/packet-netmon-802_11.c +++ b/epan/dissectors/packet-netmon-802_11.c @@ -239,5 +239,5 @@ proto_reg_handoff_netmon_802_11(void) ieee80211_handle = find_dissector("wlan"); netmon_802_11_handle = new_create_dissector_handle(dissect_netmon_802_11, proto_netmon_802_11); - dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE802_11_NETMON_RADIO, netmon_802_11_handle); + dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_NETMON, netmon_802_11_handle); } diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c index 041a647a1a..f646bcdd64 100644 --- a/epan/dissectors/packet-radiotap.c +++ b/epan/dissectors/packet-radiotap.c @@ -2119,7 +2119,7 @@ void proto_reg_handoff_radiotap(void) radiotap_handle = find_dissector("radiotap"); - dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP, + dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_RADIOTAP, radiotap_handle); } diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index b5781fb926..7b73f79e34 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -87,8 +87,8 @@ static int hf_sensormac = -1; #define TZSP_ENCAP_ETHERNET 1 #define TZSP_ENCAP_IEEE_802_11 18 -#define TZSP_ENCAP_PRISM_HEADER 119 -#define TZSP_ENCAP_WLAN_AVS 127 +#define TZSP_ENCAP_IEEE_802_11_PRISM 119 +#define TZSP_ENCAP_IEEE_802_11_AVS 127 /* ************************************************************************* */ /* Generic header options */ @@ -254,8 +254,8 @@ struct encap_map { static const struct encap_map map_table[] = { { TZSP_ENCAP_ETHERNET, WTAP_ENCAP_ETHERNET }, - { TZSP_ENCAP_PRISM_HEADER, WTAP_ENCAP_PRISM_HEADER }, - { TZSP_ENCAP_WLAN_AVS, WTAP_ENCAP_IEEE_802_11_WLAN_AVS }, + { TZSP_ENCAP_IEEE_802_11_PRISM, WTAP_ENCAP_IEEE_802_11_PRISM }, + { TZSP_ENCAP_IEEE_802_11_AVS, WTAP_ENCAP_IEEE_802_11_AVS }, { TZSP_ENCAP_IEEE_802_11, WTAP_ENCAP_IEEE_802_11 }, { 0, -1 } }; diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c index b0cb8c12b3..fb5659c3fd 100644 --- a/wiretap/etherpeek.c +++ b/wiretap/etherpeek.c @@ -120,16 +120,6 @@ typedef struct etherpeek_utime { #define ETHERPEEK_V7_TIMESTAMP_OFFSET 8 #define ETHERPEEK_V7_PKT_SIZE 16 -/* - * AiroPeek radio information, at the beginning of every packet. - */ -typedef struct { - guint8 data_rate; - guint8 channel; - guint8 signal_level; - guint8 unused; -} airopeek_radio_hdr_t; - typedef struct etherpeek_encap_lookup { guint16 protoNum; int encap; @@ -151,8 +141,6 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, gchar **err_info, static gboolean etherpeek_seek_read_v7(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header, guint8 *pd, int length, int *err, gchar **err_info); -static void etherpeek_fill_pseudo_header_v7( - union wtap_pseudo_header *pseudo_header, airopeek_radio_hdr_t *radio_hdr); static gboolean etherpeek_read_v56(wtap *wth, int *err, gchar **err_info, gint64 *data_offset); static gboolean etherpeek_seek_read_v56(wtap *wth, gint64 seek_off, @@ -260,13 +248,8 @@ int etherpeek_open(wtap *wth, int *err, gchar **err_info) * 802.11, with a private header giving * some radio information. Presumably * this is from AiroPeek. - * - * We supply the private header as - * the WTAP_ENCAP_IEEE_802_11_WITH_RADIO - * pseudo-header, rather than as frame - * data. */ - file_encap = WTAP_ENCAP_IEEE_802_11_WITH_RADIO; + file_encap = WTAP_ENCAP_IEEE_802_11_AIROPEEK; break; default: @@ -377,7 +360,6 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, gchar **err_info, guint64 timestamp; time_t tsecs; guint32 tusecs; - airopeek_radio_hdr_t radio_hdr; *data_offset = wth->data_offset; @@ -414,32 +396,8 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, gchar **err_info, switch (wth->file_encap) { - case WTAP_ENCAP_IEEE_802_11_WITH_RADIO: - /* - * The first 4 bytes of the packet data are radio - * information (including a reserved byte). - */ - if (sliceLength < 4) { - /* - * We don't *have* 4 bytes of packet data. - */ - *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup("etherpeek: packet not long enough for 802.11 radio header"); - return FALSE; - } - wtap_file_read_expected_bytes(&radio_hdr, 4, wth->fh, err, - err_info); - - /* - * We don't treat the radio information as packet data. - */ - sliceLength -= 4; - wth->phdr.len -= 4; - wth->phdr.caplen -= 4; - wth->data_offset += 4; - - etherpeek_fill_pseudo_header_v7(&wth->pseudo_header, - &radio_hdr); + case WTAP_ENCAP_IEEE_802_11_AIROPEEK: + wth->pseudo_header.ieee_802_11.fcs_len = 0; /* no FCS */ break; case WTAP_ENCAP_ETHERNET: @@ -462,7 +420,7 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, gchar **err_info, wth->phdr.ts.secs = tsecs - mac2unix; wth->phdr.ts.nsecs = tusecs * 1000; - if (wth->file_encap == WTAP_ENCAP_IEEE_802_11_WITH_RADIO) { + if (wth->file_encap == WTAP_ENCAP_IEEE_802_11_AIROPEEK) { /* * The last 4 bytes appear to be random data - the length * might include the FCS - so we reduce the length by 4. @@ -485,7 +443,6 @@ etherpeek_seek_read_v7(wtap *wth, gint64 seek_off, { guint8 ep_pkt[ETHERPEEK_V7_PKT_SIZE]; guint8 status; - airopeek_radio_hdr_t radio_hdr; if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) return FALSE; @@ -497,24 +454,8 @@ etherpeek_seek_read_v7(wtap *wth, gint64 seek_off, switch (wth->file_encap) { - case WTAP_ENCAP_IEEE_802_11_WITH_RADIO: - /* - * The first 4 bytes of the packet data are radio - * information (including a reserved byte). - */ - if (length < 4) { - /* - * We don't *have* 4 bytes of packet data. - */ - *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup("etherpeek: packet not long enough for 802.11 radio header"); - return FALSE; - } - wtap_file_read_expected_bytes(&radio_hdr, 4, wth->random_fh, - err, err_info); - - etherpeek_fill_pseudo_header_v7(pseudo_header, - &radio_hdr); + case WTAP_ENCAP_IEEE_802_11_AIROPEEK: + pseudo_header->ieee_802_11.fcs_len = 0; /* no FCS */ break; case WTAP_ENCAP_ETHERNET: @@ -534,16 +475,6 @@ etherpeek_seek_read_v7(wtap *wth, gint64 seek_off, return TRUE; } -static void -etherpeek_fill_pseudo_header_v7(union wtap_pseudo_header *pseudo_header, - airopeek_radio_hdr_t *radio_hdr) -{ - pseudo_header->ieee_802_11.fcs_len = 0; /* no FCS */ - pseudo_header->ieee_802_11.channel = radio_hdr->channel; - pseudo_header->ieee_802_11.data_rate = radio_hdr->data_rate; - pseudo_header->ieee_802_11.signal_level = radio_hdr->signal_level; -} - static gboolean etherpeek_read_v56(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 53563dedff..d6d179e34f 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -155,7 +155,7 @@ static const int netmon_encap[] = { WTAP_ENCAP_FDDI_BITSWAPPED, WTAP_ENCAP_ATM_PDUS, /* NDIS WAN - this is what's used for ATM */ WTAP_ENCAP_UNKNOWN, /* NDIS LocalTalk, but format 2.x uses it for IP-over-IEEE 1394 */ - WTAP_ENCAP_IEEE802_11_NETMON_RADIO, + WTAP_ENCAP_IEEE_802_11_NETMON, /* NDIS "DIX", but format 2.x uses it for 802.11 */ WTAP_ENCAP_RAW_IP, /* NDIS ARCNET raw, but format 2.x uses it for "Tunneling interfaces" */ WTAP_ENCAP_RAW_IP, /* NDIS ARCNET 878.2, but format 2.x uses it for "Wireless WAN" */ @@ -457,7 +457,7 @@ netmon_set_pseudo_header_info(int pkt_encap, pseudo_header->eth.fcs_len = 0; break; - case WTAP_ENCAP_IEEE802_11_NETMON_RADIO: + case WTAP_ENCAP_IEEE_802_11_NETMON: /* * It appears to be the case that management * frames have an FCS and data frames don't; diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 0cc27620e4..b624aa934e 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -225,11 +225,11 @@ static const struct { { 117, WTAP_ENCAP_PFLOG }, { 118, WTAP_ENCAP_CISCO_IOS }, - { 119, WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */ + { 119, WTAP_ENCAP_IEEE_802_11_PRISM }, /* 802.11 plus Prism monitor mode radio header */ { 121, WTAP_ENCAP_HHDLC }, /* HiPath HDLC */ { 122, WTAP_ENCAP_IP_OVER_FC }, /* RFC 2625 IP-over-FC */ { 123, WTAP_ENCAP_ATM_PDUS }, /* SunATM */ - { 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */ + { 127, WTAP_ENCAP_IEEE_802_11_RADIOTAP }, /* 802.11 plus radiotap radio header */ { 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */ { 129, WTAP_ENCAP_ARCNET_LINUX }, { 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */ @@ -270,7 +270,7 @@ static const struct { { 161, WTAP_ENCAP_USER14 }, { 162, WTAP_ENCAP_USER15 }, - { 163, WTAP_ENCAP_IEEE_802_11_WLAN_AVS }, /* 802.11 plus AVS WLAN header */ + { 163, WTAP_ENCAP_IEEE_802_11_AVS }, /* 802.11 plus AVS radio header */ /* * 164 is reserved for Juniper-private chassis-internal @@ -1477,9 +1477,9 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, break; case WTAP_ENCAP_IEEE_802_11: - case WTAP_ENCAP_PRISM_HEADER: - case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP: - case WTAP_ENCAP_IEEE_802_11_WLAN_AVS: + case WTAP_ENCAP_IEEE_802_11_PRISM: + case WTAP_ENCAP_IEEE_802_11_RADIOTAP: + case WTAP_ENCAP_IEEE_802_11_AVS: /* * We don't know whether there's an FCS in this frame or not. * XXX - are there any OSes where the capture mechanism diff --git a/wiretap/wtap.c b/wiretap/wtap.c index c18756adb5..0d58ffa2b5 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -206,17 +206,17 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_IEEE_802_11 */ { "IEEE 802.11 Wireless LAN", "ieee-802-11" }, - /* WTAP_ENCAP_PRISM_HEADER */ - { "IEEE 802.11 plus Prism II monitor mode header", "prism" }, + /* WTAP_ENCAP_IEEE_802_11_PRISM */ + { "IEEE 802.11 plus Prism II monitor mode radio header", "ieee-802-11-prism" }, /* WTAP_ENCAP_IEEE_802_11_WITH_RADIO */ { "IEEE 802.11 Wireless LAN with radio information", "ieee-802-11-radio" }, - /* WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP */ - { "IEEE 802.11 plus radiotap WLAN header", "ieee-802-11-radiotap" }, + /* WTAP_ENCAP_IEEE_802_11_RADIOTAP */ + { "IEEE 802.11 plus radiotap radio header", "ieee-802-11-radiotap" }, - /* WTAP_ENCAP_IEEE_802_11_WLAN_AVS */ - { "IEEE 802.11 plus AVS WLAN header", "ieee-802-11-avs" }, + /* WTAP_ENCAP_IEEE_802_11_AVS */ + { "IEEE 802.11 plus AVS radio header", "ieee-802-11-avs" }, /* WTAP_ENCAP_SLL */ { "Linux cooked-mode capture", "linux-sll" }, @@ -521,7 +521,7 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_SOCKETCAN */ { "SocketCAN", "socketcan" }, - /* WTAP_ENCAP_IEEE802_11_NETMON_RADIO */ + /* WTAP_ENCAP_IEEE_802_11_NETMON */ { "IEEE 802.11 plus Network Monitor radio header", "ieee-802-11-netmon" }, /* WTAP_ENCAP_IEEE802_15_4_NOFCS */ @@ -576,7 +576,10 @@ static struct encap_type_info encap_table_base[] = { { "BACnet MS/TP with Directional Info", "bacnet-ms-tp-with-direction" }, /* WTAP_ENCAP_IXVERIWAVE */ - { "IxVeriWave header and stats block", "ixveriwave" } + { "IxVeriWave header and stats block", "ixveriwave" }, + + /* WTAP_ENCAP_IEEE_802_11_AIROPEEK */ + { "IEEE 802.11 plus AiroPeek radio header", "ieee-802-11-airopeek" }, }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 74a30a9c6a..f671466728 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -110,10 +110,10 @@ extern "C" { #define WTAP_ENCAP_IP_OVER_FC 18 #define WTAP_ENCAP_PPP_WITH_PHDR 19 #define WTAP_ENCAP_IEEE_802_11 20 -#define WTAP_ENCAP_PRISM_HEADER 21 +#define WTAP_ENCAP_IEEE_802_11_PRISM 21 #define WTAP_ENCAP_IEEE_802_11_WITH_RADIO 22 -#define WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP 23 -#define WTAP_ENCAP_IEEE_802_11_WLAN_AVS 24 +#define WTAP_ENCAP_IEEE_802_11_RADIOTAP 23 +#define WTAP_ENCAP_IEEE_802_11_AVS 24 #define WTAP_ENCAP_SLL 25 #define WTAP_ENCAP_FRELAY 26 #define WTAP_ENCAP_FRELAY_WITH_PHDR 27 @@ -215,7 +215,7 @@ extern "C" { #define WTAP_ENCAP_JPEG_JFIF 123 /* obsoleted by WTAP_ENCAP_MIME*/ #define WTAP_ENCAP_IPNET 124 #define WTAP_ENCAP_SOCKETCAN 125 -#define WTAP_ENCAP_IEEE802_11_NETMON_RADIO 126 +#define WTAP_ENCAP_IEEE_802_11_NETMON 126 #define WTAP_ENCAP_IEEE802_15_4_NOFCS 127 #define WTAP_ENCAP_RAW_IPFIX 128 #define WTAP_ENCAP_RAW_IP4 129 @@ -234,6 +234,7 @@ extern "C" { #define WTAP_ENCAP_V5_EF 142 #define WTAP_ENCAP_BACNET_MS_TP_WITH_PHDR 143 #define WTAP_ENCAP_IXVERIWAVE 144 +#define WTAP_ENCAP_IEEE_802_11_AIROPEEK 145 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |