diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-19 18:00:20 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-19 18:00:20 +0000 |
| commit | d1751061c8a3b7c560869d3c2222f1ec723bad67 (patch) | |
| tree | 7b89e677acb02e100788af8866abe7271c375dc9 /wiretap | |
| parent | 703635b9796d77cc9ff16671a598a9af1a7aff53 (diff) | |
| download | wireshark-d1751061c8a3b7c560869d3c2222f1ec723bad67.tar.gz wireshark-d1751061c8a3b7c560869d3c2222f1ec723bad67.tar.bz2 wireshark-d1751061c8a3b7c560869d3c2222f1ec723bad67.zip | |
Initial support for Network Monitor 802.11 radio header.
svn path=/trunk/; revision=33583
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netmon.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index afd8f1a90c..a5ac170995 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -146,7 +146,8 @@ 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 */ - WTAP_ENCAP_UNKNOWN, /* NDIS "DIX" - should not occur */ + WTAP_ENCAP_IEEE802_11_NETMON_RADIO, + /* NDIS "DIX" - used for 802.11 */ WTAP_ENCAP_UNKNOWN, /* NDIS ARCNET raw */ WTAP_ENCAP_UNKNOWN, /* NDIS ARCNET 878.2 */ WTAP_ENCAP_UNKNOWN, /* NDIS ATM (no, this is NOT used for ATM) */ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 00e74e21a5..1ac731a123 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -470,7 +470,10 @@ static struct encap_type_info encap_table_base[] = { { "Solaris IPNET", "ipnet" }, /* WTAP_ENCAP_SOCKETCAN */ - { "SocketCAN", "socketcan" } + { "SocketCAN", "socketcan" }, + + /* WTAP_ENCAP_IEEE802_11_NETMON_RADIO */ + { "IEEE 802.11 plus Network Monitor radio header", "ieee-802-11-netmon" } }; 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 eec38c4766..c726a99e0d 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -215,6 +215,7 @@ extern "C" { #define WTAP_ENCAP_JPEG_JFIF 123 #define WTAP_ENCAP_IPNET 124 #define WTAP_ENCAP_SOCKETCAN 125 +#define WTAP_ENCAP_IEEE802_11_NETMON_RADIO 126 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |