From Didier Gautheron:

[obnox/wireshark/wip.git] / epan / dissectors / packet-icmpv6.c

diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 0cd48dc515dbbcd81fed91cffebde4574e6db613..84d94346e8a086e8de05c36bd7973411ef3b11b3 100644 (file)
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -363,9 +363,6 @@ dissect_icmpv6ndopt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
     guint32 no_of_pars;
     guint32 i;
 
-    if (!tree)
-        return;
-
 again:
     if ((int)tvb_reported_length(tvb) <= offset)
         return; /* No more options left */
@@ -1636,11 +1633,8 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             /* RFC 4380 
              * 5.2.9. Direct IPv6 Connectivity Test 
              */
-            if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-                col_clear(pinfo->cinfo, COL_PROTOCOL);
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo");
-            }    
-            col_add_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test");
+            col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo");    
+            col_set_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test");
         } else {   
             if (coltypename && strcmp(coltypename, "Unknown") == 0) {
                 g_snprintf(typebuf, sizeof(typebuf), "Unknown (0x%02x)",