aboutsummaryrefslogtreecommitdiffstats
path: root/packet-pim.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-01-22 03:33:45 +0000
committerGuy Harris <guy@alum.mit.edu>2001-01-22 03:33:45 +0000
commit9f2c88966a252520a4bafaa5fee36cf39c1eb85a (patch)
treed6278fa82b47a9aa4ce9153dbf718e6cfc6b8fdc /packet-pim.c
parent79e1fdb9e56339d8d7e8d9df090dc0386cf4131e (diff)
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements. Move the setting of the Protocol column in various 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. Make the IP dissector static, as it's called only via dissector tables or dissector handles. Also make the "dissect the TOS field as the DiffServ DS field" flag static, as it's not referred to outside of "packet-ip.c". In the NCP dissector, refer to the port type through "pinfo" rather than through the global "pi", as it's a tvbuffified dissector. svn path=/trunk/; revision=2929
Diffstat (limited to 'packet-pim.c')
-rw-r--r--packet-pim.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/packet-pim.c b/packet-pim.c
index d472003082..448ab0640d 100644
--- a/packet-pim.c
+++ b/packet-pim.c
@@ -2,7 +2,7 @@
* Routines for PIM disassembly
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-pim.c,v 1.22 2001/01/13 06:34:32 guy Exp $
+ * $Id: packet-pim.c,v 1.23 2001/01/22 03:33:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -219,10 +219,6 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
proto_tree *pimopt_tree = NULL;
proto_item *tiopt;
- CHECK_DISPLAY_AS_DATA(proto_pim, tvb, pinfo, tree);
-
- pinfo->current_proto = "PIM";
-
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, "PIM");
if (check_col(pinfo->fd, COL_INFO))