diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-21 22:51:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-21 22:51:46 +0000 |
| commit | d9718a693d2ee60f6e9b018313efb4905b5a2509 (patch) | |
| tree | a5ba5f29141aafb5d72821e978779663274ab03c /packet-ieee80211.c | |
| parent | 412318920cc91433503bea190063df715aedeb84 (diff) | |
Remove some more "CHECK_DISPLAY_AS_DATA()" calls and code to set
"pinfo->current_proto", in dissectors always called through dissector
tables and handles.
Make the IEEE 802.11 dissector static, as it's not called externally.
Clear the Info column in the Linux cooked capture and 802.1q VLAN
dissectors, before extracting anything from the packet, so that if an
exception is thrown, the Info column doesn't reflect the previous
protocol.
Don't extract the encapsulated protocol in the VLAN dissector until you
use it, so that if the frame contains the VLAN ID but not the
encapsulated protocol, we at least put the VLAN ID into the protocol
tree.
svn path=/trunk/; revision=2927
Diffstat (limited to 'packet-ieee80211.c')
| -rw-r--r-- | packet-ieee80211.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index e242e8bd15..006c92d174 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.10 2001/01/10 23:28:46 guy Exp $ + * $Id: packet-ieee80211.c,v 1.11 2001/01/21 22:51:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -175,12 +175,6 @@ col_add_str(fd,COL_INFO,info); #define TAG_CHALLENGE_TEXT 0x10 -/* ************************************************************************* */ -/* Various constants used in this module */ -/* ************************************************************************* */ -static const char *capture_proto_name = "IEEE 802.11"; - - static int proto_wlan = -1; /* ************************************************************************* */ /* Header field info values for FC-field */ @@ -728,7 +722,7 @@ add_tagged_field (proto_tree * tree, tvbuff_t * tvb, int offset) /* ************************************************************************* */ /* Dissect 802.11 frame */ /* ************************************************************************* */ -void +static void dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { guint16 fcf, flags; @@ -749,10 +743,6 @@ dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) cap_len = pinfo->captured_len; fcf = tvb_get_letohs (tvb, 0); - CHECK_DISPLAY_AS_DATA(proto_wlan, tvb, pinfo, tree); - - pinfo->current_proto = capture_proto_name; - if (check_col (pinfo->fd, COL_PROTOCOL)) col_set_str (pinfo->fd, COL_PROTOCOL, "IEEE 802.11"); |