diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-01-29 10:58:28 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-01-29 10:58:28 +0000 |
| commit | cf131d9e168b68d69b326f4df3a40861360f8455 (patch) | |
| tree | 63e6888426dcc6922055eb790d8c24088af0f1a0 /packet-tzsp.c | |
| parent | ff641180dd6444cf7bc6049f24854229a26d580b (diff) | |
The DLT_ value 127 is being used for the BSD radio header, and the
current CVS libpcap uses 163 for the AVS radio header (127 was never
used for the AVS radio header). Redo the Wiretap encapsulation values
for that (and shuffle them to put the 802.11 Wiretap values together).
svn path=/trunk/; revision=9904
Diffstat (limited to 'packet-tzsp.c')
| -rw-r--r-- | packet-tzsp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packet-tzsp.c b/packet-tzsp.c index c88d6360fb..dde6cc2e90 100644 --- a/packet-tzsp.c +++ b/packet-tzsp.c @@ -1,6 +1,6 @@ /* packet-tzsp.c * - * $Id: packet-tzsp.c,v 1.5 2003/12/15 00:08:57 guy Exp $ + * $Id: packet-tzsp.c,v 1.6 2004/01/29 10:58:28 guy Exp $ * * Copyright 2002, Tazmen Technologies Inc * @@ -82,12 +82,13 @@ static int hf_sensormac = -1; /* ************************************************************************* */ /* Encapsulation type values */ +/* Note that these are not all the same as DLT_ values */ /* ************************************************************************* */ #define TZSP_ENCAP_ETHERNET 1 #define TZSP_ENCAP_IEEE_802_11 18 #define TZSP_ENCAP_PRISM_HEADER 119 -#define TZSP_ENCAP_WLAN_HEADER 127 +#define TZSP_ENCAP_WLAN_AVS 127 /* ************************************************************************* */ /* Generic header options */ @@ -254,7 +255,7 @@ 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_HEADER, WTAP_ENCAP_WLAN_HEADER }, + { TZSP_ENCAP_WLAN_AVS, WTAP_ENCAP_IEEE_802_11_WLAN_AVS }, { TZSP_ENCAP_IEEE_802_11, WTAP_ENCAP_IEEE_802_11 }, { 0, -1 } }; |