diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-06-16 00:51:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-06-16 00:51:45 +0000 |
| commit | 07bdfa61bc89914b43e372c3238c7dede250c235 (patch) | |
| tree | 599966860a410f9ab263bbd3a8793597d91dfbb7 /packet-ppp.c | |
| parent | 2bb26e5d5b590c3c9f95b0de33eecc0c49795e56 (diff) | |
| download | wireshark-07bdfa61bc89914b43e372c3238c7dede250c235.tar.gz wireshark-07bdfa61bc89914b43e372c3238c7dede250c235.tar.bz2 wireshark-07bdfa61bc89914b43e372c3238c7dede250c235.zip | |
Set the Protocol column in dissectors for PPP-specific subprotocols.
svn path=/trunk/; revision=3556
Diffstat (limited to 'packet-ppp.c')
| -rw-r--r-- | packet-ppp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packet-ppp.c b/packet-ppp.c index b6ae958512..22e3fea188 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -1,7 +1,7 @@ /* packet-ppp.c * Routines for ppp packet disassembly * - * $Id: packet-ppp.c,v 1.66 2001/06/15 20:35:08 guy Exp $ + * $Id: packet-ppp.c,v 1.67 2001/06/16 00:51:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1071,6 +1071,10 @@ dissect_cp( tvbuff_t *tvb, int proto_id, int proto_subtree_index, id = tvb_get_guint8(tvb, 1); length = tvb_get_ntohs(tvb, 2); + if(check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, + proto_get_protocol_short_name(proto_id)); + if(check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "%s %s", proto_get_protocol_short_name(proto_id), @@ -1419,6 +1423,10 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { id = tvb_get_guint8(tvb, 1); length = tvb_get_ntohs(tvb, 2); + if(check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, + proto_get_protocol_short_name(proto_pap)); + if(check_col(pinfo->fd, COL_INFO)) col_add_fstr(pinfo->fd, COL_INFO, "%s %s", proto_get_protocol_short_name(proto_pap), |