Don't display the data portion of an ER NPDU - we dissect it as a CLNP

PDU.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3526 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-clnp.c b/packet-clnp.c
index 9d0ba98a9911074c075cc9e8f4939dd056120fd0..898c8be19c556a47881866d631c83edfccb47ce0 100644 (file)
--- 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: