diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-01-18 21:23:30 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-01-18 21:23:30 +0000 |
| commit | cb6644ea4b0d27636a9138d6f1e77c45fe3722a7 (patch) | |
| tree | 64dbbcd25b2f553921fd2812b0d0315161276ee1 /wiretap | |
| parent | 86cbd0b55952f5f43b8c8878aa56299ffadfe9a7 (diff) | |
From Tom Brezinski via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6746
Adding support for Network Instruments 802.11 wireless captures
Attaching very simple change to allow reading of Network Instruments Observer 802.11 wireless capture files.
svn path=/trunk/; revision=40571
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/network_instruments.c | 2 | ||||
| -rw-r--r-- | wiretap/network_instruments.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 97ae73ef45..6cf5d30166 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -713,6 +713,8 @@ static gint observer_to_wtap_encap(int observer_encap) return WTAP_ENCAP_TOKEN_RING; case OBSERVER_FIBRE_CHANNEL: return WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS; + case OBSERVER_WIRELESS_802_11: + return WTAP_ENCAP_IEEE_802_11; case OBSERVER_UNDEFINED: return WTAP_ENCAP_UNKNOWN; } diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h index 5a06f1b11c..4b032b98e0 100644 --- a/wiretap/network_instruments.h +++ b/wiretap/network_instruments.h @@ -144,6 +144,7 @@ typedef struct packet_entry_header #define OBSERVER_ETHERNET 0x00 #define OBSERVER_TOKENRING 0x01 #define OBSERVER_FIBRE_CHANNEL 0x08 +#define OBSERVER_WIRELESS_802_11 0x09 /* * Packet type values. |