/* packet-ipv6.c
* Routines for IPv6 packet disassembly
*
- * $Id: packet-ipv6.c,v 1.29 2000/03/12 04:47:40 gram Exp $
+ * $Id: packet-ipv6.c,v 1.43 2000/08/13 14:08:06 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <string.h>
#include <stdio.h>
#include <glib.h>
+#include "etypes.h"
+#include "ppptypes.h"
#include "packet.h"
-#include "packet-icmpv6.h"
#include "packet-ip.h"
#include "packet-ipsec.h"
#include "packet-ipv6.h"
-#include "packet-pim.h"
#include "packet-tcp.h"
#include "packet-udp.h"
#include "resolv.h"
static int hf_ipv6_hlim = -1;
static int hf_ipv6_src = -1;
static int hf_ipv6_dst = -1;
+static int hf_ipv6_addr = -1;
#ifdef TEST_FINALHDR
static int hf_ipv6_final = -1;
#endif
if (tree) {
/* !!! specify length */
- ti = proto_tree_add_text(tree, offset, len,
+ ti = proto_tree_add_text(tree, NullTVB, offset, len,
"Routing Header, Type %u", rt.ip6r_type);
rthdr_tree = proto_item_add_subtree(ti, ett_ipv6);
- proto_tree_add_text(rthdr_tree,
+ proto_tree_add_text(rthdr_tree, NullTVB,
offset + offsetof(struct ip6_rthdr, ip6r_nxt), 1,
"Next header: %s (0x%02x)", ipprotostr(rt.ip6r_nxt), rt.ip6r_nxt);
- proto_tree_add_text(rthdr_tree,
+ proto_tree_add_text(rthdr_tree, NullTVB,
offset + offsetof(struct ip6_rthdr, ip6r_len), 1,
"Length: %u (%d bytes)", rt.ip6r_len, len);
- proto_tree_add_text(rthdr_tree,
+ proto_tree_add_text(rthdr_tree, NullTVB,
offset + offsetof(struct ip6_rthdr, ip6r_type), 1,
"Type: %u", rt.ip6r_type);
- proto_tree_add_text(rthdr_tree,
+ proto_tree_add_text(rthdr_tree, NullTVB,
offset + offsetof(struct ip6_rthdr, ip6r_segleft), 1,
"Segments left: %u", rt.ip6r_segleft);
for (a = rt0->ip6r0_addr, n = 0;
a < (struct e_in6_addr *)(buf + len);
a++, n++) {
- proto_tree_add_text(rthdr_tree,
+ proto_tree_add_text(rthdr_tree, NullTVB,
offset + offsetof(struct ip6_rthdr0, ip6r0_addr) + n * sizeof(struct e_in6_addr),
sizeof(struct e_in6_addr),
#ifdef INET6
}
static int
-dissect_frag6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+dissect_frag6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
+ int *fragstart) {
struct ip6_frag frag;
int len;
+ proto_item *ti;
+ proto_tree *rthdr_tree;
memcpy(&frag, (void *) &pd[offset], sizeof(frag));
len = sizeof(frag);
-
+ *fragstart = ntohs(frag.ip6f_offlg) & 0xfff8;
if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO,
- "IPv6 fragment (nxt=%s (0x%02x) off=0x%04x id=0x%x)",
+ "IPv6 fragment (nxt=%s (0x%02x) off=%u id=0x%x)",
ipprotostr(frag.ip6f_nxt), frag.ip6f_nxt,
- (frag.ip6f_offlg >> 3) & 0x1fff, frag.ip6f_ident);
+ *fragstart, frag.ip6f_ident);
+ }
+ if (tree) {
+ ti = proto_tree_add_text(tree, NullTVB, offset, len,
+ "Fragmention Header");
+ rthdr_tree = proto_item_add_subtree(ti, ett_ipv6);
+
+ proto_tree_add_text(rthdr_tree, NullTVB,
+ offset + offsetof(struct ip6_frag, ip6f_nxt), 1,
+ "Next header: %s (0x%02x)",
+ ipprotostr(frag.ip6f_nxt), frag.ip6f_nxt);
+
+ #if 0
+ proto_tree_add_text(rthdr_tree, NullTVB,
+ offset + offsetof(struct ip6_frag, ip6f_reserved), 1,
+ "Reserved: %u",
+ frag.ip6f_reserved);
+ #endif
+
+ proto_tree_add_text(rthdr_tree, NullTVB,
+ offset + offsetof(struct ip6_frag, ip6f_offlg), 2,
+ "Offset: %u",
+ ntohs(frag.ip6f_offlg) & 0xfff8);
+
+ proto_tree_add_text(rthdr_tree, NullTVB,
+ offset + offsetof(struct ip6_frag, ip6f_offlg), 2,
+ "More fragments: %s",
+ frag.ip6f_offlg & IP6F_MORE_FRAG ?
+ "Yes" : "No");
+
+ proto_tree_add_text(rthdr_tree, NullTVB,
+ offset + offsetof(struct ip6_frag, ip6f_ident), 4,
+ "Identification: 0x%08x",
+ frag.ip6f_ident);
}
return len;
}
if (tree) {
/* !!! specify length */
- ti = proto_tree_add_text(tree, offset, len,
+ ti = proto_tree_add_text(tree, NullTVB, offset, len,
"%s Header", optname);
dstopt_tree = proto_item_add_subtree(ti, ett_ipv6);
- proto_tree_add_text(dstopt_tree,
+ proto_tree_add_text(dstopt_tree, NullTVB,
offset + offsetof(struct ip6_ext, ip6e_nxt), 1,
"Next header: %s (0x%02x)", ipprotostr(ext.ip6e_nxt), ext.ip6e_nxt);
- proto_tree_add_text(dstopt_tree,
+ proto_tree_add_text(dstopt_tree, NullTVB,
offset + offsetof(struct ip6_ext, ip6e_len), 1,
"Length: %u (%d bytes)", ext.ip6e_len, len);
while (p < pd + offset + len) {
switch (p[0]) {
case IP6OPT_PAD1:
- proto_tree_add_text(dstopt_tree, p - pd, 1,
+ proto_tree_add_text(dstopt_tree, NullTVB, p - pd, 1,
"Pad1");
p++;
break;
case IP6OPT_PADN:
- proto_tree_add_text(dstopt_tree, p - pd, p[1] + 2,
+ proto_tree_add_text(dstopt_tree, NullTVB, p - pd, p[1] + 2,
"PadN: %u bytes", p[1] + 2);
p += p[1];
p += 2;
break;
case IP6OPT_JUMBO:
if (p[1] == 4) {
- proto_tree_add_text(dstopt_tree, p - pd, p[1] + 2,
+ proto_tree_add_text(dstopt_tree, NullTVB, p - pd, p[1] + 2,
"Jumbo payload: %u (%u bytes)",
pntohl(&p[2]), p[1] + 2);
} else {
- proto_tree_add_text(dstopt_tree, p - pd, p[1] + 2,
+ proto_tree_add_text(dstopt_tree, NullTVB, p - pd, p[1] + 2,
"Jumbo payload: Invalid length (%u bytes)",
p[1] + 2);
}
"Unknown");
} else
rta = "Invalid length";
- ti = proto_tree_add_text(dstopt_tree, p - pd, p[1] + 2,
+ ti = proto_tree_add_text(dstopt_tree, NullTVB, p - pd, p[1] + 2,
"Router alert: %s (%u bytes)", rta, p[1] + 2);
p += p[1];
p += 2;
guint8 nxt;
int advance;
int poffset;
+ int frag;
struct ip6_hdr ipv6;
+ OLD_CHECK_DISPLAY_AS_DATA(proto_ipv6, pd, offset, fd, tree);
+
memcpy(&ipv6, (void *) &pd[offset], sizeof(ipv6));
+ pi.ipproto = ipv6.ip6_nxt; /* XXX make work TCP follow (ipproto = 6) */
+
SET_ADDRESS(&pi.net_src, AT_IPv6, 16, &pd[offset + IP6H_SRC]);
SET_ADDRESS(&pi.src, AT_IPv6, 16, &pd[offset + IP6H_SRC]);
SET_ADDRESS(&pi.net_dst, AT_IPv6, 16, &pd[offset + IP6H_DST]);
SET_ADDRESS(&pi.dst, AT_IPv6, 16, &pd[offset + IP6H_DST]);
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "IPv6");
-
if (tree) {
/* !!! specify length */
- ti = proto_tree_add_item(tree, proto_ipv6, offset, 40, NULL);
+ ti = proto_tree_add_item(tree, proto_ipv6, NullTVB, offset, 40, FALSE);
ipv6_tree = proto_item_add_subtree(ti, ett_ipv6);
/* !!! warning: version also contains 4 Bit priority */
- proto_tree_add_item(ipv6_tree, hf_ipv6_version,
+ proto_tree_add_uint(ipv6_tree, hf_ipv6_version, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_vfc), 1,
(ipv6.ip6_vfc >> 4) & 0x0f);
- proto_tree_add_item(ipv6_tree, hf_ipv6_class,
+ proto_tree_add_uint(ipv6_tree, hf_ipv6_class, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_flow), 4,
(guint8)((ntohl(ipv6.ip6_flow) >> 20) & 0xff));
* there should be no alignment problems for ip6_flow, since it's the first
* guint32 in the ipv6 struct
*/
- proto_tree_add_uint_format(ipv6_tree, hf_ipv6_flow,
+ proto_tree_add_uint_format(ipv6_tree, hf_ipv6_flow, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_flow), 4,
(unsigned long)(ntohl(ipv6.ip6_flow & IPV6_FLOWLABEL_MASK)),
"Flowlabel: 0x%05lx",
(unsigned long)(ntohl(ipv6.ip6_flow & IPV6_FLOWLABEL_MASK)));
- proto_tree_add_item(ipv6_tree, hf_ipv6_plen,
+ proto_tree_add_uint(ipv6_tree, hf_ipv6_plen, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_plen), 2,
ntohs(ipv6.ip6_plen));
- proto_tree_add_uint_format(ipv6_tree, hf_ipv6_nxt,
+ proto_tree_add_uint_format(ipv6_tree, hf_ipv6_nxt, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_nxt), 1,
ipv6.ip6_nxt,
"Next header: %s (0x%02x)",
ipprotostr(ipv6.ip6_nxt), ipv6.ip6_nxt);
- proto_tree_add_item(ipv6_tree, hf_ipv6_hlim,
+ proto_tree_add_uint(ipv6_tree, hf_ipv6_hlim, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_hlim), 1,
ipv6.ip6_hlim);
- proto_tree_add_ipv6_format(ipv6_tree, hf_ipv6_src,
+ proto_tree_add_ipv6_hidden(ipv6_tree, hf_ipv6_addr, NullTVB,
+ offset + offsetof(struct ip6_hdr, ip6_src), 16,
+ ipv6.ip6_src.s6_addr8);
+ proto_tree_add_ipv6_hidden(ipv6_tree, hf_ipv6_addr, NullTVB,
+ offset + offsetof(struct ip6_hdr, ip6_dst), 16,
+ ipv6.ip6_dst.s6_addr8);
+
+ proto_tree_add_ipv6_format(ipv6_tree, hf_ipv6_src, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_src), 16,
- &ipv6.ip6_src,
+ (guint8 *)&ipv6.ip6_src,
#ifdef INET6
"Source address: %s (%s)",
get_hostname6(&ipv6.ip6_src),
#endif
ip6_to_str(&ipv6.ip6_src));
- proto_tree_add_ipv6_format(ipv6_tree, hf_ipv6_dst,
+ proto_tree_add_ipv6_format(ipv6_tree, hf_ipv6_dst, NullTVB,
offset + offsetof(struct ip6_hdr, ip6_dst), 16,
- &ipv6.ip6_dst,
+ (guint8 *)&ipv6.ip6_dst,
#ifdef INET6
"Destination address: %s (%s)",
get_hostname6(&ipv6.ip6_dst),
/* start of the new header (could be a extension header) */
nxt = pd[poffset = offset + offsetof(struct ip6_hdr, ip6_nxt)];
offset += sizeof(struct ip6_hdr);
+ frag = 0;
again:
switch (nxt) {
nxt = pd[poffset = offset];
offset += advance;
goto again;
- case IP_PROTO_IPIP:
- dissect_ip(pd, offset, fd, tree);
- break;
case IP_PROTO_ROUTING:
advance = dissect_routing6(pd, offset, fd, tree);
nxt = pd[poffset = offset];
offset += advance;
goto again;
case IP_PROTO_FRAGMENT:
- advance = dissect_frag6(pd, offset, fd, tree);
+ advance = dissect_frag6(pd, offset, fd, tree, &frag);
nxt = pd[poffset = offset];
offset += advance;
goto again;
- case IP_PROTO_ICMPV6:
-#ifdef TEST_FINALHDR
- proto_tree_add_item_hidden(ipv6_tree, hf_ipv6_final, poffset, 1, nxt);
-#endif
- dissect_icmpv6(pd, offset, fd, tree);
- break;
- case IP_PROTO_NONE:
-#ifdef TEST_FINALHDR
- proto_tree_add_item_hidden(ipv6_tree, hf_ipv6_final, poffset, 1, nxt);
-#endif
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO, "IPv6 no next header");
- }
- break;
case IP_PROTO_AH:
- advance = dissect_ah(pd, offset, fd, tree);
+ advance = dissect_ah_old(pd, offset, fd, tree);
nxt = pd[poffset = offset];
offset += advance;
goto again;
- case IP_PROTO_ESP:
- dissect_esp(pd, offset, fd, tree);
- break;
case IP_PROTO_DSTOPTS:
advance = dissect_dstopts(pd, offset, fd, tree);
nxt = pd[poffset = offset];
offset += advance;
goto again;
- case IP_PROTO_TCP:
-#ifdef TEST_FINALHDR
- proto_tree_add_item_hidden(ipv6_tree, hf_ipv6_final, poffset, 1, nxt);
-#endif
- dissect_tcp(pd, offset, fd, tree);
- break;
- case IP_PROTO_UDP:
-#ifdef TEST_FINALHDR
- proto_tree_add_item_hidden(ipv6_tree, hf_ipv6_final, poffset, 1, nxt);
-#endif
- dissect_udp(pd, offset, fd, tree);
- break;
- case IP_PROTO_PIM:
-#ifdef TEST_FINALHDR
- proto_tree_add_item_hidden(ipv6_tree, hf_ipv6_final, poffset, 1, nxt);
-#endif
- dissect_pim(pd, offset, fd, tree);
- break;
- case IP_PROTO_IPCOMP:
- dissect_ipcomp(pd, offset, fd, tree);
- break;
- default:
+ }
+
#ifdef TEST_FINALHDR
- proto_tree_add_item_hidden(ipv6_tree, hf_ipv6_final, poffset, 1, nxt);
+ proto_tree_add_uint_hidden(ipv6_tree, hf_ipv6_final, NullTVB, poffset, 1, nxt);
#endif
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO, "%s (0x%02x)",
- ipprotostr(nxt), nxt);
- }
- dissect_data(pd, offset, fd, tree);
- break;
+ if (frag) {
+ /* fragmented */
+ if (check_col(fd, COL_PROTOCOL))
+ col_add_str(fd, COL_PROTOCOL, "IPv6");
+ /* COL_INFO was filled in by "dissect_frag6()" */
+ old_dissect_data(pd, offset, fd, tree);
+ } else {
+ /* do lookup with the subdissector table */
+ if (!old_dissector_try_port(ip_dissector_table, nxt, pd, offset, fd, tree)) {
+ /* Unknown protocol */
+ if (check_col(fd, COL_PROTOCOL))
+ col_add_str(fd, COL_PROTOCOL, "IPv6");
+ if (check_col(fd, COL_INFO))
+ col_add_fstr(fd, COL_INFO, "%s (0x%02x)", ipprotostr(nxt), nxt);
+ old_dissect_data(pd, offset, fd, tree);
}
+ }
+}
+
+static void
+dissect_ipv6_none(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+ if (check_col(fd, COL_INFO))
+ col_add_fstr(fd, COL_INFO, "IPv6 no next header");
+
+ /* XXX - dissect the payload as padding? */
}
void
{ "Destination", "ipv6.dst",
FT_IPv6, BASE_NONE, NULL, 0x0,
"Destination IPv6 Address" }},
+ { &hf_ipv6_addr,
+ { "Address", "ipv6.addr",
+ FT_IPv6, BASE_NONE, NULL, 0x0,
+ "Source or Destination IPv6 Address" }},
#ifdef TEST_FINALHDR
{ &hf_ipv6_final,
{ "Final next header", "ipv6.final",
proto_register_field_array(proto_ipv6, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_ipv6(void)
+{
+ old_dissector_add("ethertype", ETHERTYPE_IPv6, dissect_ipv6);
+ old_dissector_add("ppp.protocol", PPP_IPV6, dissect_ipv6);
+ old_dissector_add("ip.proto", IP_PROTO_IPV6, dissect_ipv6);
+ old_dissector_add("ip.proto", IP_PROTO_NONE, dissect_ipv6_none);
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff