diff options
| -rw-r--r-- | packet-atalk.c | 41 | ||||
| -rw-r--r-- | packet-bgp.c | 6 | ||||
| -rw-r--r-- | packet-eigrp.c | 23 | ||||
| -rw-r--r-- | packet-hsrp.c | 8 | ||||
| -rw-r--r-- | packet-igrp.c | 16 | ||||
| -rw-r--r-- | packet-ip.c | 18 | ||||
| -rw-r--r-- | packet-ip.h | 3 | ||||
| -rw-r--r-- | packet-ncp.c | 9 | ||||
| -rw-r--r-- | packet-ospf.c | 11 | ||||
| -rw-r--r-- | packet-pim.c | 6 | ||||
| -rw-r--r-- | packet-tcp.c | 6 | ||||
| -rw-r--r-- | packet-udp.c | 11 | ||||
| -rw-r--r-- | packet-vrrp.c | 6 | ||||
| -rw-r--r-- | packet-vtp.c | 6 |
14 files changed, 62 insertions, 108 deletions
diff --git a/packet-atalk.c b/packet-atalk.c index 2ca0c3b51b..d2f239c0ad 100644 --- a/packet-atalk.c +++ b/packet-atalk.c @@ -1,7 +1,7 @@ /* packet-atalk.c * Routines for Appletalk packet disassembly (DDP, currently). * - * $Id: packet-atalk.c,v 1.49 2001/01/09 06:31:33 guy Exp $ + * $Id: packet-atalk.c,v 1.50 2001/01/22 03:33:45 guy Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -198,14 +198,12 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; guint8 function; - CHECK_DISPLAY_AS_DATA(proto_rtmp, tvb, pinfo, tree); - - pinfo->current_proto = "RTMP"; - - function = tvb_get_guint8(tvb, 0); - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "RTMP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); + + function = tvb_get_guint8(tvb, 0); if (check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "%s", @@ -229,9 +227,10 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 node; /* might be more than 8 bits */ int i; - CHECK_DISPLAY_AS_DATA(proto_rtmp, tvb, pinfo, tree); - - pinfo->current_proto = "RTMP"; + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "RTMP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); net = tvb_get_ntohs(tvb, offset); nodelen_bits = tvb_get_guint8(tvb, offset+2); @@ -243,9 +242,6 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { nodelen = 2; } - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "RTMP"); - if (check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "Net: %u Node Len: %u Node: %u", net, nodelen_bits, node); @@ -319,17 +315,15 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint op, count; int i; - CHECK_DISPLAY_AS_DATA(proto_nbp, tvb, pinfo, tree); - - pinfo->current_proto = "NBP"; + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "NBP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); info = tvb_get_guint8(tvb, offset); op = info >> 4; count = info & 0x0F; - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "NBP"); - if (check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "Op: %s Count: %u", val_to_str(op, nbp_op_vals, "Unknown (0x%01x)"), count); @@ -385,9 +379,10 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { static struct atalk_ddp_addr src, dst; tvbuff_t *new_tvb; - CHECK_DISPLAY_AS_DATA(proto_ddp, tvb, pinfo, tree); - - pinfo->current_proto = "DDP"; + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "DDP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); tvb_memcpy(tvb, (guint8 *)&ddp, 0, sizeof(e_ddp)); ddp.dnet=ntohs(ddp.dnet); @@ -406,8 +401,6 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { SET_ADDRESS(&pinfo->net_dst, AT_ATALK, sizeof dst, (guint8 *)&dst); SET_ADDRESS(&pinfo->dst, AT_ATALK, sizeof dst, (guint8 *)&dst); - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "DDP"); if (check_col(pinfo->fd, COL_INFO)) col_add_str(pinfo->fd, COL_INFO, val_to_str(ddp.type, op_vals, "Unknown DDP protocol (%02x)")); diff --git a/packet-bgp.c b/packet-bgp.c index eadae77ec3..337c8b5065 100644 --- a/packet-bgp.c +++ b/packet-bgp.c @@ -2,7 +2,7 @@ * Routines for BGP packet dissection. * Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org> * - * $Id: packet-bgp.c,v 1.32 2001/01/09 06:31:34 guy Exp $ + * $Id: packet-bgp.c,v 1.33 2001/01/22 03:33:45 guy Exp $ * * Supports: * RFC1771 A Border Gateway Protocol 4 (BGP-4) @@ -1332,10 +1332,10 @@ dissect_bgp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) int hlen; /* BGP header length */ char *typ; /* BGP message type */ - OLD_CHECK_DISPLAY_AS_DATA(proto_bgp, pd, offset, fd, tree); - if (check_col(fd, COL_PROTOCOL)) col_set_str(fd, COL_PROTOCOL, "BGP"); + if (check_col(fd, COL_INFO)) + col_clear(fd, COL_INFO); p = &pd[offset]; l = END_OF_FRAME; diff --git a/packet-eigrp.c b/packet-eigrp.c index f728a394a5..a53bb69d3e 100644 --- a/packet-eigrp.c +++ b/packet-eigrp.c @@ -2,7 +2,7 @@ * Routines for EIGRP dissection * Copyright 2000, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-eigrp.c,v 1.11 2001/01/09 06:31:35 guy Exp $ + * $Id: packet-eigrp.c,v 1.12 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -145,16 +145,15 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 tlv,size, offset = EIGRP_HEADER_LENGTH; guint32 ack; - CHECK_DISPLAY_AS_DATA(proto_eigrp, tvb, pinfo, tree); - - pinfo->current_proto = "EIGRP"; - + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "EIGRP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); + opcode_tmp=opcode=tvb_get_guint8(tvb,1); ack = tvb_get_ntohl(tvb,12); if (opcode==EIGRP_HELLO) { if (ack == 0) opcode_tmp=EIGRP_HI; else opcode_tmp=EIGRP_ACK; } - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "EIGRP"); if (check_col(pinfo->fd, COL_INFO)) col_add_str(pinfo->fd, COL_INFO, val_to_str(opcode_tmp , eigrp_opcode_vals, "Unknown (0x%04x)")); @@ -453,15 +452,15 @@ proto_register_eigrp(void) }, }; - static gint *ett[] = { - &ett_eigrp, - &ett_tlv, - }; + static gint *ett[] = { + &ett_eigrp, + &ett_tlv, + }; proto_eigrp = proto_register_protocol("Enhanced Interior Gateway Routing Protocol", "EIGRP", "eigrp"); proto_register_field_array(proto_eigrp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - } +} void proto_reg_handoff_eigrp(void) diff --git a/packet-hsrp.c b/packet-hsrp.c index ed0b4cbb02..9e6f1cbbd4 100644 --- a/packet-hsrp.c +++ b/packet-hsrp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-hsrp.c,v 1.15 2001/01/09 06:31:36 guy Exp $ + * $Id: packet-hsrp.c,v 1.16 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -107,12 +107,10 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 opcode, state; - CHECK_DISPLAY_AS_DATA(proto_hsrp, tvb, pinfo, tree); - - pinfo->current_proto = "HSRP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "HSRP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); opcode = tvb_get_guint8(tvb, 1); state = tvb_get_guint8(tvb, 2); diff --git a/packet-igrp.c b/packet-igrp.c index 6b2ad76e94..86a31f1b3e 100644 --- a/packet-igrp.c +++ b/packet-igrp.c @@ -2,7 +2,7 @@ * Routines for IGRP dissection * Copyright 2000, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-igrp.c,v 1.4 2001/01/09 06:31:36 guy Exp $ + * $Id: packet-igrp.c,v 1.5 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -60,18 +60,16 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *igrp_tree, *igrp_vektor_tree; tvbuff_t *next_tvb; - CHECK_DISPLAY_AS_DATA(proto_igrp, tvb, pinfo, tree); - - pinfo->current_proto = "IGRP"; - + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "IGRP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); + ver_and_opcode = tvb_get_guint8(tvb,0); update = tvb_get_guint8(tvb,1); as = tvb_get_ntohs(tvb,2); - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "IGRP"); - if (check_col(pinfo->fd, COL_INFO)) { switch (ver_and_opcode) { case 0x11: @@ -207,7 +205,7 @@ void proto_register_igrp(void) void proto_reg_handoff_igrp(void) { - dissector_add("ip.proto", IP_PROTO_IGRP , dissect_igrp, proto_igrp); + dissector_add("ip.proto", IP_PROTO_IGRP, dissect_igrp, proto_igrp); } /* IGRP Packet structure: diff --git a/packet-ip.c b/packet-ip.c index 3eaa63c54b..a304a3a60e 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.121 2001/01/13 07:47:48 guy Exp $ + * $Id: packet-ip.c,v 1.122 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -60,7 +60,7 @@ static void dissect_icmp(tvbuff_t *, packet_info *, proto_tree *); static void dissect_igmp(tvbuff_t *, packet_info *, proto_tree *); /* Decode the old IPv4 TOS field as the DiffServ DS Field */ -gboolean g_ip_dscp_actif = TRUE; +static gboolean g_ip_dscp_actif = TRUE; static int proto_ip = -1; static int hf_ip_version = -1; @@ -784,7 +784,7 @@ static guint16 ip_checksum(const guint8 *ptr, int len) return in_cksum(&cksum_vec[0], 1); } -void +static void dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { e_ip iph; @@ -797,10 +797,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 ipsum; tvbuff_t *next_tvb; - CHECK_DISPLAY_AS_DATA(proto_ip, tvb, pinfo, tree); - - pinfo->current_proto = "IP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "IP"); if (check_col(pinfo->fd, COL_INFO)) @@ -1013,10 +1009,6 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 addr_entry_size = 0; int i; - CHECK_DISPLAY_AS_DATA(proto_icmp, tvb, pinfo, tree); - - pinfo->current_proto = "ICMP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "ICMP"); if (check_col(pinfo->fd, COL_INFO)) @@ -1241,10 +1233,6 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; gchar *type_str; - CHECK_DISPLAY_AS_DATA(proto_igmp, tvb, pinfo, tree); - - pinfo->current_proto = "IGMP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "IGMP"); if (check_col(pinfo->fd, COL_INFO)) diff --git a/packet-ip.h b/packet-ip.h index 2a1f22492b..50b6de63c3 100644 --- a/packet-ip.h +++ b/packet-ip.h @@ -1,7 +1,7 @@ /* packet-ip.h * Definitions for IP packet disassembly structures and routines * - * $Id: packet-ip.h,v 1.16 2000/12/04 06:37:44 guy Exp $ + * $Id: packet-ip.h,v 1.17 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -28,7 +28,6 @@ #define __PACKET_IP_H__ void capture_ip(const u_char *, int, packet_counts *); -void dissect_ip(tvbuff_t *, packet_info *, proto_tree *); #define IP_PROTO_IP 0 /* dummy for IP */ #define IP_PROTO_HOPOPTS 0 /* IP6 hop-by-hop options */ diff --git a/packet-ncp.c b/packet-ncp.c index 6ccd1d2b6b..f3ab871fd0 100644 --- a/packet-ncp.c +++ b/packet-ncp.c @@ -3,7 +3,7 @@ * Gilbert Ramirez <gram@xiexie.org> * Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net> * - * $Id: packet-ncp.c,v 1.46 2001/01/09 06:31:39 guy Exp $ + * $Id: packet-ncp.c,v 1.47 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -260,15 +260,12 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int hdr_offset = 0; int commhdr; - CHECK_DISPLAY_AS_DATA(proto_ncp, tvb, pinfo, tree); - - pinfo->current_proto = "NCP"; if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "NCP"); if (check_col(pinfo->fd, COL_INFO)) col_clear(pinfo->fd, COL_INFO); - if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) { + if ( pinfo->ptype == PT_TCP || pinfo->ptype == PT_UDP ) { ncpiph.signature = tvb_get_ntohl(tvb, 0); ncpiph.length = tvb_get_ntohl(tvb, 4); hdr_offset += 8; @@ -294,7 +291,7 @@ dissect_ncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_ncp, tvb, 0, tvb_length(tvb), FALSE); ncp_tree = proto_item_add_subtree(ti, ett_ncp); - if ( pi.ptype == PT_TCP || pi.ptype == PT_UDP ) { + if ( pinfo->ptype == PT_TCP || pinfo->ptype == PT_UDP ) { proto_tree_add_uint(ncp_tree, hf_ncp_ip_sig, tvb, 0, 4, ncpiph.signature); proto_tree_add_uint(ncp_tree, hf_ncp_ip_length, tvb, 4, 4, ncpiph.length); if ( ncpiph.signature == NCPIP_RQST ) { diff --git a/packet-ospf.c b/packet-ospf.c index 09c03e230c..d618e3a82d 100644 --- a/packet-ospf.c +++ b/packet-ospf.c @@ -2,7 +2,7 @@ * Routines for OSPF packet disassembly * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-ospf.c,v 1.35 2001/01/09 06:31:40 guy Exp $ + * $Id: packet-ospf.c,v 1.36 2001/01/22 03:33:45 guy Exp $ * * At this time, this module is able to analyze OSPF * packets as specified in RFC2328. MOSPF (RFC1584) and other @@ -171,14 +171,13 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char auth_data[8]; int crypto_len; - CHECK_DISPLAY_AS_DATA(proto_ospf, tvb, pinfo, tree); - - pinfo->current_proto = "OSPF"; + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "OSPF"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); version = tvb_get_guint8(tvb, 0); packet_type = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "OSPF"); if (check_col(pinfo->fd, COL_INFO)) { col_add_str(pinfo->fd, COL_INFO, val_to_str(packet_type, pt_vals, "Unknown (%u)")); 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)) diff --git a/packet-tcp.c b/packet-tcp.c index 8e303f738e..595a39ea65 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.97 2001/01/09 06:31:44 guy Exp $ + * $Id: packet-tcp.c,v 1.98 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -453,10 +453,6 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 computed_cksum; guint length_remaining; - CHECK_DISPLAY_AS_DATA(proto_tcp, tvb, pinfo, tree); - - pinfo->current_proto = "TCP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "TCP"); diff --git a/packet-udp.c b/packet-udp.c index f853bfeb70..88c7fd792d 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.85 2001/01/11 16:27:23 gram Exp $ + * $Id: packet-udp.c,v 1.86 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -144,9 +144,10 @@ dissect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 computed_cksum; int offset = 0; - CHECK_DISPLAY_AS_DATA(proto_udp, tvb, pinfo, tree); - - pinfo->current_proto = "UDP"; + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "UDP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); /* Avoids alignment problems on many architectures. */ tvb_memcpy(tvb, (guint8 *)&uh, offset, sizeof(e_udphdr)); @@ -155,8 +156,6 @@ dissect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) uh_ulen = ntohs(uh.uh_ulen); uh_sum = ntohs(uh.uh_sum); - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "UDP"); if (check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "Source port: %s Destination port: %s", get_udp_port(uh_sport), get_udp_port(uh_dport)); diff --git a/packet-vrrp.c b/packet-vrrp.c index 6007a26c1f..a508580869 100644 --- a/packet-vrrp.c +++ b/packet-vrrp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-vrrp.c,v 1.13 2001/01/09 06:31:44 guy Exp $ + * $Id: packet-vrrp.c,v 1.14 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -92,10 +92,6 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 ver_type; vec_t cksum_vec[1]; - CHECK_DISPLAY_AS_DATA(proto_vrrp, tvb, pinfo, tree); - - pinfo->current_proto = "VRRP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "VRRP"); if (check_col(pinfo->fd, COL_INFO)) diff --git a/packet-vtp.c b/packet-vtp.c index 9402cb5b9b..78cc6670f6 100644 --- a/packet-vtp.c +++ b/packet-vtp.c @@ -1,7 +1,7 @@ /* packet-vtp.c * Routines for the disassembly of Cisco's Virtual Trunking Protocol * - * $Id: packet-vtp.c,v 1.10 2001/01/09 06:31:44 guy Exp $ + * $Id: packet-vtp.c,v 1.11 2001/01/22 03:33:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -102,10 +102,6 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 *upd_timestamp; int vlan_info_len; - CHECK_DISPLAY_AS_DATA(proto_vtp, tvb, pinfo, tree); - - pinfo->current_proto = "VTP"; - if (check_col(pinfo->fd, COL_PROTOCOL)) col_set_str(pinfo->fd, COL_PROTOCOL, "VTP"); if (check_col(pinfo->fd, COL_INFO)) |