diff options
Diffstat (limited to 'packet-sap.c')
| -rw-r--r-- | packet-sap.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/packet-sap.c b/packet-sap.c index 071cdef3c5..8485a667bc 100644 --- a/packet-sap.c +++ b/packet-sap.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-sap.c,v 1.18 2001/01/09 06:31:41 guy Exp $ + * $Id: packet-sap.c,v 1.19 2001/01/25 06:14:14 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -142,8 +142,11 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *si, *sif; proto_tree *sap_tree, *sap_flags_tree; - CHECK_DISPLAY_AS_DATA(proto_sap, tvb, pinfo, tree); - + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "SAP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); + vers_flags = tvb_get_guint8(tvb, offset); is_ipv6 = vers_flags&MCAST_SAP_BIT_A; is_del = vers_flags&MCAST_SAP_BIT_T; @@ -153,11 +156,6 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sap_version = (vers_flags&MCAST_SAP_VERSION_MASK)>>MCAST_SAP_VERSION_SHIFT; addr_len = (is_ipv6) ? sizeof(struct e_in6_addr) : 4; - pinfo->current_proto = "SAP"; - - if (check_col(pinfo->fd, COL_PROTOCOL)) - col_set_str(pinfo->fd, COL_PROTOCOL, "SAP"); - if (check_col(pinfo->fd, COL_INFO)) { col_add_fstr(pinfo->fd, COL_INFO, "%s (v%u)", (is_del) ? "Deletion" : "Announcement", sap_version); |