From 243514726a3775cf75887bd69d37dd9f0a5acf06 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 22 Jan 2001 00:20:29 +0000 Subject: 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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2928 f5534014-38df-0310-8fa8-9805f1628bb7 --- packet-gre.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'packet-gre.c') 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 * - * $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 @@ -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)); -- cgit v1.2.3