diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-05-02 03:11:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-05-02 03:11:00 +0000 |
| commit | 0275247b9788e74a97414abc74f6e9f12868ee57 (patch) | |
| tree | e683bcda97ba1f4c5b23656635d578a9d897f51a /epan/dissectors/packet-tzsp.c | |
| parent | 8be799ecafab97966bb85f83ed105fe0e389c8dc (diff) | |
Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header"
encapsulations.
For pre-V9 AiroPeek captures, leave the radio information in the packet
data, just as we do with the Prism, AVS, radiotap, and NetMon headers.
Add a dissector for it.
svn path=/trunk/; revision=42379
Diffstat (limited to 'epan/dissectors/packet-tzsp.c')
| -rw-r--r-- | epan/dissectors/packet-tzsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 } }; |