diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-02-15 11:37:56 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-02-15 11:37:56 +0000 |
| commit | d49247e45095e5633f2d9e29ddb85c797fe73da3 (patch) | |
| tree | 39324874e3f53c16f51136cf5f3b2049b36853ef | |
| parent | 3e39a2b0f2fd49b66d9e6aba2b277f3c64ef6485 (diff) | |
| download | wireshark-d49247e45095e5633f2d9e29ddb85c797fe73da3.tar.gz | |
AiroPeek puts variable-length, not padded fixed-length, 802.11 headers
into captures.
The data rate header is in .5 megabyte/second units, not .5
kilobyte/second units.
svn path=/trunk/; revision=4741
| -rw-r--r-- | packet-airopeek.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-airopeek.c b/packet-airopeek.c index 2d928811bd..d23f275e9b 100644 --- a/packet-airopeek.c +++ b/packet-airopeek.c @@ -1,7 +1,7 @@ /* packet-airopeek.c * Routines for AiroPeek capture file dissection * - * $Id: packet-airopeek.c,v 1.1 2002/01/29 09:45:55 guy Exp $ + * $Id: packet-airopeek.c,v 1.2 2002/02/15 11:37:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -47,7 +47,7 @@ static int hf_airopeek_signal_strength = -1; static gint ett_airopeek = -1; -static dissector_handle_t ieee80211_fixed_handle; +static dissector_handle_t ieee80211_handle; static void dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -71,7 +71,7 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) data_rate = tvb_get_guint8(tvb, 0); proto_tree_add_uint_format(airopeek_tree, hf_airopeek_data_rate, tvb, 0, 1, data_rate, - "Data Rate: %g kb/s", .5*data_rate); + "Data Rate: %g mb/s", .5*data_rate); proto_tree_add_item(airopeek_tree, hf_airopeek_channel, tvb, 1, 1, FALSE); @@ -84,7 +84,7 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* dissect the 802.11 header next */ next_tvb = tvb_new_subset(tvb, 4, -1, -1); - call_dissector(ieee80211_fixed_handle, next_tvb, pinfo, tree); + call_dissector(ieee80211_handle, next_tvb, pinfo, tree); } void @@ -116,8 +116,8 @@ proto_reg_handoff_airopeek(void) { dissector_handle_t airopeek_handle; - /* handle for 802.11 dissector for fixed-length 802.11 headers */ - ieee80211_fixed_handle = find_dissector("wlan_fixed"); + /* handle for 802.11 dissector */ + ieee80211_handle = find_dissector("wlan"); airopeek_handle = create_dissector_handle(dissect_airopeek, proto_airopeek); |