Remove TODO comments about NSAP and ISIS decodings since

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

diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index 3607a01440b1dd47041cda0c954eed102c0ff92a..9d39912efad41f28db1ec528a7e04bedb5a1a180 100644 (file)
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
 /* packet-icmpv6.c
  * Routines for ICMPv6 packet disassembly 
  *
- * $Id: packet-icmpv6.c,v 1.11 1999/11/16 11:42:31 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.14 2000/03/12 04:47:38 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -57,7 +57,6 @@
 #include "packet.h"
 #include "packet-ipv6.h"
 #include "resolv.h"
-#include "util.h"
 
 #ifndef offsetof
 #define        offsetof(type, member)  ((size_t)(&((type *)0)->member))
@@ -85,7 +84,7 @@ dissect_icmpv6opt(const u_char *pd, int offset, frame_data *fd, proto_tree *tree
        return;
 
 again:
-    if (!(fd->cap_len > offset))
+    if (!IS_DATA_IN_FRAME(offset))
        return;
 
     opt = (struct nd_opt_hdr *)&pd[offset];
@@ -348,12 +347,12 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
        ti = proto_tree_add_item(tree, proto_icmpv6, offset, len, NULL);
        icmp6_tree = proto_item_add_subtree(ti, ett_icmpv6);
 
-       proto_tree_add_item_format(icmp6_tree, hf_icmpv6_type,
+       proto_tree_add_uint_format(icmp6_tree, hf_icmpv6_type,
            offset + offsetof(struct icmp6_hdr, icmp6_type), 1,
            dp->icmp6_type,
            "Type: 0x%02x (%s)", dp->icmp6_type, typename);
        if (codename) {
-           proto_tree_add_item_format(icmp6_tree, hf_icmpv6_code,
+           proto_tree_add_uint_format(icmp6_tree, hf_icmpv6_code,
                offset + offsetof(struct icmp6_hdr, icmp6_code), 1,
                dp->icmp6_code,
                "Code: 0x%02x (%s)", dp->icmp6_code, codename);