diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-21 22:10:22 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-21 22:10:22 +0000 |
| commit | 412318920cc91433503bea190063df715aedeb84 (patch) | |
| tree | 640947c1520f83f403619c0ee30c9748aed2a1c5 /packet-isl.c | |
| parent | 987c7dc2a3efd14fc7e564aeffa24980ab2aeba2 (diff) | |
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
Diffstat (limited to 'packet-isl.c')
| -rw-r--r-- | packet-isl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-isl.c b/packet-isl.c index 2469f3c79f..e43e6a3e00 100644 --- a/packet-isl.c +++ b/packet-isl.c @@ -1,7 +1,7 @@ /* packet-isl.c * Routines for Cisco ISL Ethernet header disassembly * - * $Id: packet-isl.c,v 1.22 2001/01/21 20:16:01 guy Exp $ + * $Id: packet-isl.c,v 1.23 2001/01/21 22:10:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -154,10 +154,6 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *compat_pd; int compat_offset; - CHECK_DISPLAY_AS_DATA(proto_isl, tvb, pinfo, tree); - - pinfo->current_proto = "ISL"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "ISL"); if (check_col(pinfo->fd, COL_INFO)) |