Boolean fields are just like other fields - if you use the field name

[obnox/wireshark/wip.git] / packet-clnp.c

diff --git a/packet-clnp.c b/packet-clnp.c
index 5bd4e90ff9e2499ea72e5e0f61e5903411e8d533..8e385813505c1c2f8a334ac95ac17844ccfb181b 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.22 2001/01/09 06:31:34 guy Exp $
+ * $Id: packet-clnp.c,v 1.24 2001/01/22 08:03:44 guy Exp $
  * Laurent Deniel <deniel@worldnet.fr>
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
@@ -1571,12 +1571,10 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree *discpdu_tree;
   tvbuff_t   *next_tvb;
 
-  CHECK_DISPLAY_AS_DATA(proto_clnp, tvb, pinfo, tree);
-
-  pinfo->current_proto = "CLNP";
-
   if (check_col(pinfo->fd, COL_PROTOCOL))
     col_set_str(pinfo->fd, COL_PROTOCOL, "CLNP");
+  if (check_col(pinfo->fd, COL_INFO))
+    col_clear(pinfo->fd, COL_INFO);
 
   cnf_proto_id = tvb_get_guint8(tvb, P_CLNP_PROTO_ID);
   if (cnf_proto_id == NLPID_NULL) {
@@ -1932,4 +1930,6 @@ proto_reg_handoff_clnp(void)
            proto_clnp);
        dissector_add("osinl", NLPID_NULL, dissect_clnp,
            proto_clnp);        /* Inactive subset */
+       dissector_add("fr.ietf", NLPID_ISO8473_CLNP, dissect_clnp,
+           proto_clnp);        /* Inactive subset */
 }