diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-22 00:20:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-22 00:20:29 +0000 |
| commit | 79e1fdb9e56339d8d7e8d9df090dc0386cf4131e (patch) | |
| tree | 35171754ad82def133bb42df8e8c630cd917c7e3 /packet-gre.c | |
| parent | d9718a693d2ee60f6e9b018313efb4905b5a2509 (diff) | |
| download | wireshark-79e1fdb9e56339d8d7e8d9df090dc0386cf4131e.tar.gz wireshark-79e1fdb9e56339d8d7e8d9df090dc0386cf4131e.tar.bz2 wireshark-79e1fdb9e56339d8d7e8d9df090dc0386cf4131e.zip | |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in the Appletalk ARP and IPX
dissectors before anything is fetched from the packet, and also clear
the Info column at that point in those and some other dissectors, so
that if an exception is thrown, the columns don't reflect the previous
protocol.
Fix the registration of the IPX RIP dissector to use the right protocol
ID.
svn path=/trunk/; revision=2928
Diffstat (limited to 'packet-gre.c')
| -rw-r--r-- | packet-gre.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-gre.c b/packet-gre.c index 8fcb87f3a5..28889464cb 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-gre.c,v 1.38 2001/01/13 07:47:48 guy Exp $ + * $Id: packet-gre.c,v 1.39 2001/01/22 00:20:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -92,10 +92,6 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 sre_length; tvbuff_t *next_tvb; - CHECK_DISPLAY_AS_DATA(proto_gre, tvb, pinfo, tree); - - pinfo->current_proto = "GRE"; - flags_and_ver = tvb_get_ntohs(tvb, offset); type = tvb_get_ntohs(tvb, offset + sizeof(flags_and_ver)); |