Put the top-level item for a TLV into the protocol tree with a text
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 20 Apr 2001 08:14:35 +0000 (08:14 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 20 Apr 2001 08:14:35 +0000 (08:14 +0000)
value, so that if we throw an exception while processing that TLV before
setting it in the dissector for that particular TLV we at least have
something in the tree.

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

packet-eigrp.c

index 5546d77cc992deb0c595dfa52f8a992a64d58f80..b58d1cb2626d6db25880a93cca23bea023306e6f 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for EIGRP dissection
  * Copyright 2000, Paul Ionescu <paul@acorp.ro>
  *
- * $Id: packet-eigrp.c,v 1.13 2001/03/22 16:24:14 gram Exp $
+ * $Id: packet-eigrp.c,v 1.14 2001/04/20 08:14:35 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -181,7 +181,8 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
             tlv = tvb_get_ntohs(tvb,offset);
             size =  tvb_get_ntohs(tvb,offset+2);
 
-            ti = proto_tree_add_notext (eigrp_tree, tvb, offset,size);
+            ti = proto_tree_add_text (eigrp_tree, tvb, offset,size,
+                "%s",val_to_str(tlv, eigrp_tlv_vals, "Unknown (0x%04x)"));
 
             tlv_tree = proto_item_add_subtree (ti, ett_tlv);
             proto_tree_add_uint_format (tlv_tree,hf_eigrp_tlv, tvb,offset,2,tlv,"Type = 0x%04x (%s)",tlv,val_to_str(tlv,eigrp_tlv_vals, "Unknown")) ;
@@ -226,9 +227,6 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
                case TLV_AT_EXT:
                        dissect_eigrp_at_ext(next_tvb, tlv_tree, ti);
                        break;                   
-
-               default:
-                       proto_item_set_text(ti,"Unknown TLV   (0x%04x)",tlv) ;
                };
 
             offset+=size;
@@ -247,8 +245,6 @@ static void dissect_eigrp_par (tvbuff_t *tvb, proto_tree *tree, proto_item *ti)
        proto_tree_add_text (tree,tvb,4,1,"K5 = %u",tvb_get_guint8(tvb,4));
        proto_tree_add_text (tree,tvb,5,1,"Rezerved");
        proto_tree_add_text (tree,tvb,6,2,"Hold Time = %u",tvb_get_ntohs(tvb,6));
-       proto_item_set_text (ti,"%s",match_strval(TLV_PAR,eigrp_tlv_vals));
-       
 }
 
 static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree, proto_item *ti)
@@ -266,8 +262,6 @@ static void dissect_eigrp_seq (tvbuff_t *tvb, proto_tree *tree, proto_item *ti)
                        /* nothing */
                        ;
                }
-       proto_item_set_text (ti,"%s",match_strval(TLV_SEQ,eigrp_tlv_vals));
-                       
 }              
 
 static void dissect_eigrp_sv (tvbuff_t *tvb, proto_tree *tree, proto_item *ti)