diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-06-08 07:44:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-06-08 07:44:36 +0000 |
| commit | e8c7a026d2f02bb9bd947bbba6833acb80c5e894 (patch) | |
| tree | 5bee25545304fe5b4102873048da2b3e9272904c /packet-clnp.c | |
| parent | c9da803a083959710644b51b2063a58e16854a81 (diff) | |
| download | wireshark-e8c7a026d2f02bb9bd947bbba6833acb80c5e894.tar.gz wireshark-e8c7a026d2f02bb9bd947bbba6833acb80c5e894.tar.bz2 wireshark-e8c7a026d2f02bb9bd947bbba6833acb80c5e894.zip | |
Don't display the data portion of an ER NPDU - we dissect it as a CLNP
PDU.
svn path=/trunk/; revision=3526
Diffstat (limited to 'packet-clnp.c')
| -rw-r--r-- | packet-clnp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-clnp.c b/packet-clnp.c index 9d0ba98a99..898c8be19c 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.30 2001/06/08 06:27:15 guy Exp $ + * $Id: packet-clnp.c,v 1.31 2001/06/08 07:44:36 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -2000,6 +2000,8 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* The payload is the header and "none, some, or all of the data part of the discarded PDU", i.e. it's like an ICMP error; dissect it as a CLNP PDU. */ + if (check_col(pinfo->fd, COL_INFO)) + col_add_fstr(pinfo->fd, COL_INFO, "%s NPDU %s", pdu_type_string, flag_string); if (tree) { next_length = tvb_length_remaining(tvb, offset); if (next_length != 0) { @@ -2033,11 +2035,9 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->net_dst = save_net_dst; pinfo->src = save_src; pinfo->dst = save_dst; - - offset += next_length; } } - break; + return; /* we're done with this PDU */ case ERQ_NPDU: case ERP_NPDU: |