* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
* derived from packet-rip.c
*
- * $Id: packet-ripng.c,v 1.5 1999/10/18 00:37:35 itojun Exp $
+ * $Id: packet-ripng.c,v 1.25 2002/01/24 09:20:51 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
#include <netinet/in.h>
#endif
+#include <string.h>
#include <glib.h>
-#include "packet.h"
-#include "packet-ipv6.h"
+#include <epan/packet.h>
#include "packet-ripng.h"
#ifndef offsetof
static int hf_ripng_cmd = -1;
static int hf_ripng_version = -1;
-void
-dissect_ripng(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+static gint ett_ripng = -1;
+static gint ett_ripng_addr = -1;
+
+#define UDP_PORT_RIPNG 521
+
+static const value_string cmdvals[] = {
+ { RIP6_REQUEST, "Request" },
+ { RIP6_RESPONSE, "Response" },
+ { 0, NULL },
+};
+
+static void
+dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+ int offset = 0;
struct rip6 rip6;
struct netinfo6 ni6;
proto_tree *ripng_tree = NULL;
proto_tree *subtree = NULL;
proto_item *ti;
- static const value_string cmdvals[] = {
- { RIP6_REQUEST, "Request" },
- { RIP6_RESPONSE, "Response" },
- { 0, NULL },
- };
- const char *cmd;
+
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
/* avoid alignment problem */
- memcpy(&rip6, &pd[offset], sizeof(rip6));
+ tvb_memcpy(tvb, (guint8 *)&rip6, offset, sizeof(rip6));
- cmd = val_to_str(rip6.rip6_cmd, cmdvals, "Unknown");
-
- if (check_col(fd, COL_PROTOCOL))
- col_add_fstr(fd, COL_PROTOCOL, "RIPng version %d", rip6.rip6_vers);
- if (check_col(fd, COL_INFO))
- col_add_fstr(fd, COL_INFO, "%s", cmd);
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "RIPng version %u", rip6.rip6_vers);
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(rip6.rip6_cmd, cmdvals, "Unknown command (%u)"));
if (tree) {
- ti = proto_tree_add_item(tree, proto_ripng, offset, END_OF_FRAME, NULL);
- ripng_tree = proto_item_add_subtree(ti, ETT_RIPNG);
+ ti = proto_tree_add_item(tree, proto_ripng, tvb, offset, -1, FALSE);
+ ripng_tree = proto_item_add_subtree(ti, ett_ripng);
- proto_tree_add_item_format(ripng_tree, hf_ripng_cmd, offset, 1,
- rip6.rip6_cmd,
- "Command: %s (%u)", cmd, rip6.rip6_cmd);
- proto_tree_add_item(ripng_tree, hf_ripng_version, offset + 1, 1,
+ proto_tree_add_uint(ripng_tree, hf_ripng_cmd, tvb, offset, 1,
+ rip6.rip6_cmd);
+ proto_tree_add_uint(ripng_tree, hf_ripng_version, tvb, offset + 1, 1,
rip6.rip6_vers);
offset += 4;
- while ((pi.captured_len - offset) >= sizeof(struct netinfo6)){
- memcpy(&ni6, &pd[offset], sizeof(ni6));
- if (ni6.rip6_tag) {
- ti = proto_tree_add_text(ripng_tree, offset,
- sizeof(ni6), "IP Address: %s/%d, Metric: %ld, tag: 0x%04x",
- ip6_to_str(&ni6.rip6_dest),
- ni6.rip6_plen,
- ni6.rip6_metric,
+ while (tvb_reported_length_remaining(tvb, offset) > 0) {
+ tvb_memcpy(tvb, (guint8 *)&ni6, offset, sizeof(ni6));
+ if (ni6.rip6_tag) {
+ ti = proto_tree_add_text(ripng_tree, tvb, offset,
+ sizeof(ni6), "IP Address: %s/%u, Metric: %u, tag: 0x%04x",
+ ip6_to_str(&ni6.rip6_dest),
+ ni6.rip6_plen,
+ ni6.rip6_metric,
+ ntohs(ni6.rip6_tag));
+ } else {
+ ti = proto_tree_add_text(ripng_tree, tvb, offset,
+ sizeof(ni6), "IP Address: %s/%u, Metric: %u",
+ ip6_to_str(&ni6.rip6_dest),
+ ni6.rip6_plen,
+ ni6.rip6_metric);
+ }
+ subtree = proto_item_add_subtree(ti, ett_ripng_addr);
+ proto_tree_add_text(subtree, tvb,
+ offset + offsetof(struct netinfo6, rip6_dest),
+ sizeof(ni6.rip6_dest), "IP Address: %s",
+ ip6_to_str(&ni6.rip6_dest));
+ proto_tree_add_text(subtree, tvb,
+ offset + offsetof(struct netinfo6, rip6_tag),
+ sizeof(ni6.rip6_tag), "Tag: 0x%04x",
ntohs(ni6.rip6_tag));
- } else {
- ti = proto_tree_add_text(ripng_tree, offset,
- sizeof(ni6), "IP Address: %s/%d, Metric: %ld",
- ip6_to_str(&ni6.rip6_dest),
- ni6.rip6_plen,
+ proto_tree_add_text(subtree, tvb,
+ offset + offsetof(struct netinfo6, rip6_plen),
+ sizeof(ni6.rip6_plen), "Prefix length: %u",
+ ni6.rip6_plen);
+ proto_tree_add_text(subtree, tvb,
+ offset + offsetof(struct netinfo6, rip6_metric),
+ sizeof(ni6.rip6_metric), "Metric: %u",
ni6.rip6_metric);
- }
- subtree = proto_item_add_subtree(ti, ETT_RIPNG_ADDR);
- proto_tree_add_text(subtree,
- offset + offsetof(struct netinfo6, rip6_dest),
- sizeof(ni6.rip6_dest), "IP Address: %s",
- ip6_to_str(&ni6.rip6_dest));
- proto_tree_add_text(subtree,
- offset + offsetof(struct netinfo6, rip6_tag),
- sizeof(ni6.rip6_tag), "Tag: 0x%04x",
- ntohs(ni6.rip6_tag));
- proto_tree_add_text(subtree,
- offset + offsetof(struct netinfo6, rip6_plen),
- sizeof(ni6.rip6_plen), "Prefix length: %d",
- ni6.rip6_plen);
- proto_tree_add_text(subtree,
- offset + offsetof(struct netinfo6, rip6_metric),
- sizeof(ni6.rip6_metric), "Metric: %d",
- ni6.rip6_metric);
-
- offset += sizeof(ni6);
- }
+
+ offset += sizeof(ni6);
+ }
}
}
static hf_register_info hf[] = {
{ &hf_ripng_cmd,
{ "Command", "ripng.cmd",
- FT_UINT8, BASE_DEC, NULL, 0x0, "" }},
+ FT_UINT8, BASE_DEC, VALS(cmdvals),
+ 0x0, "", HFILL }},
{ &hf_ripng_version,
{ "Version", "ripng.version",
- FT_UINT8, BASE_DEC, NULL, 0x0, "" }},
+ FT_UINT8, BASE_DEC, NULL,
+ 0x0, "", HFILL }},
+ };
+ static gint *ett[] = {
+ &ett_ripng,
+ &ett_ripng_addr,
};
- proto_ripng = proto_register_protocol("RIPng", "ripng");
+ proto_ripng = proto_register_protocol("RIPng", "RIPng", "ripng");
proto_register_field_array(proto_ripng, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_ripng(void)
+{
+ dissector_handle_t ripng_handle;
+
+ ripng_handle = create_dissector_handle(dissect_ripng, proto_ripng);
+ dissector_add("udp.port", UDP_PORT_RIPNG, ripng_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff