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-sll.c | |
| parent | 412318920cc91433503bea190063df715aedeb84 (diff) | |
| download | wireshark-d9718a693d2ee60f6e9b018313efb4905b5a2509.tar.gz | |
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-sll.c')
| -rw-r--r-- | packet-sll.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packet-sll.c b/packet-sll.c index 78bec6f64c..1dbf75b2ef 100644 --- a/packet-sll.c +++ b/packet-sll.c @@ -1,7 +1,7 @@ /* packet-sll.c * Routines for disassembly of packets from Linux "cooked mode" captures * - * $Id: packet-sll.c,v 1.6 2001/01/18 07:44:39 guy Exp $ + * $Id: packet-sll.c,v 1.7 2001/01/21 22:51:46 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -141,11 +141,10 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; proto_tree *fh_tree = NULL; - CHECK_DISPLAY_AS_DATA(proto_sll, tvb, pinfo, tree); - - pinfo->current_proto = "SLL"; if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "SLL"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); pkttype = tvb_get_ntohs(tvb, 0); |