* Routines for RIPv1 and RIPv2 packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-rip.c,v 1.18 2000/08/13 14:08:42 deniel Exp $
+ * $Id: packet-rip.c,v 1.28 2001/12/10 00:25:33 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-rip.h"
#define UDP_PORT_RIP 520
+#define RIPv1 1
+#define RIPv2 2
+
+static const value_string version_vals[] = {
+ { RIPv1, "RIPv1" },
+ { RIPv2, "RIPv2" },
+ { 0, NULL }
+};
+
+static const value_string command_vals[] = {
+ { 1, "Request" },
+ { 2, "Response" },
+ { 3, "Traceon" },
+ { 4, "Traceoff" },
+ { 5, "Vendor specific (Sun)" },
+ { 0, NULL }
+};
+
+static const value_string family_vals[] = {
+ { 2, "IP" },
+ { 0, NULL }
+};
+
+#define RIP_HEADER_LENGTH 4
+#define RIP_ENTRY_LENGTH 20
+
static int proto_rip = -1;
+static int hf_rip_command = -1;
+static int hf_rip_version = -1;
+static int hf_rip_routing_domain = -1;
+static int hf_rip_ip = -1;
+static int hf_rip_netmask = -1;
+static int hf_rip_next_hop = -1;
+static int hf_rip_metric = -1;
+static int hf_rip_auth = -1;
+static int hf_rip_auth_passwd = -1;
+static int hf_rip_family = -1;
+static int hf_rip_route_tag = -1;
static gint ett_rip = -1;
static gint ett_rip_vec = -1;
-static void dissect_ip_rip_vektor(guint8 version,
- const e_rip_vektor *rip_vektor, int offset, proto_tree *tree);
-static void dissect_rip_authentication(const e_rip_authentication *rip_authentication,
- int offset, proto_tree *tree);
+static void dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
+ proto_tree *tree);
+static void dissect_rip_authentication(tvbuff_t *tvb, int offset,
+ proto_tree *tree);
static void
-dissect_rip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
- e_riphdr rip_header;
- e_rip_entry rip_entry;
- guint16 family;
+dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ int offset = 0;
proto_tree *rip_tree = NULL;
- proto_item *ti;
-
- /* we do the range checking of the index when checking wether or not this is a RIP packet */
- static char *packet_type[8] = { "never used", "Request", "Response",
- "Traceon", "Traceoff", "Vendor specific (Sun)" };
- static char *version[3] = { "RIP", "RIPv1", "RIPv2" };
+ proto_item *ti;
+ guint8 command;
+ guint8 version;
+ guint16 family;
- OLD_CHECK_DISPLAY_AS_DATA(proto_rip, pd, offset, fd, tree);
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIP");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
- /* avoid alignment problem */
- memcpy(&rip_header, &pd[offset], sizeof(rip_header));
+ command = tvb_get_guint8(tvb, 0);
+ version = tvb_get_guint8(tvb, 1);
- /* Check if we 've realy got a RIP packet */
-
- switch(rip_header.version) {
- case RIPv1:
- /* the domain field has to be set to zero for RIPv1 */
- if(!(rip_header.domain == 0)){
- old_dissect_data(pd, offset, fd, tree);
- return;
- }
- /* the RIPv2 checks are also made for v1 packets */
- case RIPv2:
- /* check wether or not command nr. is between 1-7
- * (range checking for index of char* packet_type is done at the same time)
- */
- if( !( (rip_header.command > 0) && (rip_header.command <= 7) )){
- old_dissect_data(pd, offset, fd, tree);
- return;
- }
- break;
- default:
- /* we only know RIPv1 and RIPv2 */
- old_dissect_data(pd, offset, fd, tree);
- return;
- }
-
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, version[rip_header.version] );
- if (check_col(fd, COL_INFO))
- col_add_str(fd, COL_INFO, packet_type[rip_header.command]);
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_add_str(pinfo->cinfo, COL_PROTOCOL,
+ val_to_str(version, version_vals, "RIP"));
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(command, command_vals, "Unknown command (%u)"));
if (tree) {
- ti = proto_tree_add_item(tree, proto_rip, NullTVB, offset, END_OF_FRAME, FALSE);
+ ti = proto_tree_add_item(tree, proto_rip, tvb, 0, tvb_length(tvb), FALSE);
rip_tree = proto_item_add_subtree(ti, ett_rip);
- proto_tree_add_text(rip_tree, NullTVB, offset, 1, "Command: %d (%s)", rip_header.command, packet_type[rip_header.command]);
- proto_tree_add_text(rip_tree, NullTVB, offset + 1, 1, "Version: %d", rip_header.version);
- if(rip_header.version == RIPv2)
- proto_tree_add_text(rip_tree, NullTVB, offset + 2 , 2, "Routing Domain: %d", ntohs(rip_header.domain));
+ proto_tree_add_uint(rip_tree, hf_rip_command, tvb, 0, 1, command);
+ proto_tree_add_uint(rip_tree, hf_rip_version, tvb, 1, 1, version);
+ if (version == RIPv2)
+ proto_tree_add_uint(rip_tree, hf_rip_routing_domain, tvb, 2, 2,
+ tvb_get_ntohs(tvb, 2));
/* skip header */
- offset += RIP_HEADER_LENGTH;
+ offset = RIP_HEADER_LENGTH;
/* zero or more entries */
-
- while((pi.captured_len - offset) >= RIP_ENTRY_LENGTH){
- memcpy(&rip_entry, &pd[offset], sizeof(rip_entry)); /* avoid alignment problem */
- family = ntohs(rip_entry.vektor.family);
+ while (tvb_reported_length_remaining(tvb, offset) > 0) {
+ family = tvb_get_ntohs(tvb, offset);
switch (family) {
case 2: /* IP */
- ti = proto_tree_add_text(rip_tree, NullTVB, offset,
- RIP_ENTRY_LENGTH, "IP Address: %s, Metric: %ld",
- ip_to_str((guint8 *) &(rip_entry.vektor.ip)),
- (long)ntohl(rip_entry.vektor.metric));
- dissect_ip_rip_vektor(rip_header.version, &rip_entry.vektor,
- offset, ti);
+ dissect_ip_rip_vektor(tvb, offset, version, rip_tree);
break;
case 0xFFFF:
- proto_tree_add_text(rip_tree, NullTVB, offset,
- RIP_ENTRY_LENGTH, "Authentication");
- dissect_rip_authentication(&rip_entry.authentication,
- offset, ti);
+ dissect_rip_authentication(tvb, offset, rip_tree);
break;
default:
- proto_tree_add_text(rip_tree, NullTVB, offset,
+ proto_tree_add_text(rip_tree, tvb, offset,
RIP_ENTRY_LENGTH, "Unknown address family %u",
family);
break;
}
static void
-dissect_ip_rip_vektor(guint8 version, const e_rip_vektor *rip_vektor,
- int offset, proto_tree *tree)
+dissect_ip_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
+ proto_tree *tree)
{
+ proto_item *ti;
proto_tree *rip_vektor_tree;
+ guint32 metric;
- rip_vektor_tree = proto_item_add_subtree(tree, ett_rip_vec);
+ metric = tvb_get_ntohl(tvb, offset+16);
+ ti = proto_tree_add_text(tree, tvb, offset,
+ RIP_ENTRY_LENGTH, "IP Address: %s, Metric: %u",
+ ip_to_str(tvb_get_ptr(tvb, offset+4, 4)), metric);
+ rip_vektor_tree = proto_item_add_subtree(ti, ett_rip_vec);
- proto_tree_add_text(rip_vektor_tree, NullTVB, offset, 2, "Address Family ID: IP");
- if(version == RIPv2)
- proto_tree_add_text(rip_vektor_tree, NullTVB, offset + 2 , 2, "Route Tag: %d",
- ntohs(rip_vektor->tag));
- proto_tree_add_text(rip_vektor_tree, NullTVB, offset + 4, 4, "IP Address: %s",
- ip_to_str((guint8 *) &(rip_vektor->ip)));
- if(version == RIPv2) {
- proto_tree_add_text(rip_vektor_tree, NullTVB, offset + 8 , 4, "Netmask: %s",
- ip_to_str((guint8 *) &(rip_vektor->mask)));
- proto_tree_add_text(rip_vektor_tree, NullTVB, offset + 12, 4, "Next Hop: %s",
- ip_to_str((guint8 *) &(rip_vektor->next_hop)));
+
+ proto_tree_add_uint(rip_vektor_tree, hf_rip_family, tvb, offset, 2,
+ tvb_get_ntohs(tvb, offset));
+ if (version == RIPv2) {
+ proto_tree_add_uint(rip_vektor_tree, hf_rip_route_tag, tvb, offset+2, 2,
+ tvb_get_ntohs(tvb, offset+2));
}
- proto_tree_add_text(rip_vektor_tree, NullTVB, offset + 16, 4, "Metric: %ld",
- (long)ntohl(rip_vektor->metric));
+
+ proto_tree_add_item(rip_vektor_tree, hf_rip_ip, tvb, offset+4, 4, FALSE);
+
+ if (version == RIPv2) {
+ proto_tree_add_item(rip_vektor_tree, hf_rip_netmask, tvb, offset+8, 4,
+ FALSE);
+ proto_tree_add_item(rip_vektor_tree, hf_rip_next_hop, tvb, offset+12, 4,
+ FALSE);
+ }
+ proto_tree_add_uint(rip_vektor_tree, hf_rip_metric, tvb,
+ offset+16, 4, metric);
}
static void
-dissect_rip_authentication(const e_rip_authentication *rip_authentication,
- int offset, proto_tree *tree)
+dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree)
{
+ proto_item *ti;
proto_tree *rip_authentication_tree;
guint16 authtype;
- rip_authentication_tree = proto_item_add_subtree(tree, ett_rip_vec);
+ ti = proto_tree_add_text(tree, tvb, offset, RIP_ENTRY_LENGTH,
+ "Authentication");
+ rip_authentication_tree = proto_item_add_subtree(ti, ett_rip_vec);
- authtype = ntohs(rip_authentication->authtype);
- proto_tree_add_text(rip_authentication_tree, NullTVB, offset + 2, 2,
- "Authentication type: %u", authtype);
- if (authtype == 2)
- proto_tree_add_text(rip_authentication_tree, NullTVB, offset + 4 , 16,
- "Password: %.16s",
- rip_authentication->authentication);
+ authtype = tvb_get_ntohs(tvb, offset + 2);
+ proto_tree_add_uint(rip_authentication_tree, hf_rip_auth, tvb, offset+2, 2,
+ authtype);
+ if (authtype == 2) {
+ proto_tree_add_item(rip_authentication_tree, hf_rip_auth_passwd,
+ tvb, offset+4, 16, TRUE);
+ }
}
void
proto_register_rip(void)
{
-/* static hf_register_info hf[] = {
- { &variable,
- { "Name", "rip.abbreviation", TYPE, VALS_POINTER }},
- };*/
+ static hf_register_info hf[] = {
+ { &hf_rip_command,
+ { "Command", "rip.command", FT_UINT8, BASE_DEC,
+ VALS(command_vals), 0, "What type of RIP Command is this", HFILL }},
+
+ { &hf_rip_version,
+ { "Version", "rip.version", FT_UINT8, BASE_DEC,
+ VALS(version_vals), 0, "Version of the RIP protocol", HFILL }},
+
+ { &hf_rip_family,
+ { "Address Family", "rip.family", FT_UINT16, BASE_DEC,
+ VALS(family_vals), 0, "Address family", HFILL }},
+
+ { &hf_rip_routing_domain,
+ { "Routing Domain", "rip.routing_domain", FT_UINT16, BASE_DEC,
+ NULL, 0, "RIPv2 Routing Domain", HFILL }},
+
+ { &hf_rip_ip,
+ { "IP Address", "rip.ip", FT_IPv4, BASE_NONE,
+ NULL, 0, "IP Address", HFILL}},
+
+ { &hf_rip_netmask,
+ { "Netmask", "rip.netmask", FT_IPv4, BASE_NONE,
+ NULL, 0, "Netmask", HFILL}},
+
+ { &hf_rip_next_hop,
+ { "Next Hop", "rip.next_hop", FT_IPv4, BASE_NONE,
+ NULL, 0, "Next Hop router for this route", HFILL}},
+
+ { &hf_rip_metric,
+ { "Metric", "rip.metric", FT_UINT16, BASE_DEC,
+ NULL, 0, "Metric for this route", HFILL }},
+
+ { &hf_rip_auth,
+ { "Authentication type", "rip.auth.type", FT_UINT16, BASE_DEC,
+ NULL, 0, "Type of authentication", HFILL }},
+
+ { &hf_rip_auth_passwd,
+ { "Password", "rip.auth.passwd", FT_STRING, BASE_DEC,
+ NULL, 0, "Authentication password", HFILL }},
+
+ { &hf_rip_route_tag,
+ { "Route Tag", "rip.route_tag", FT_UINT16, BASE_DEC,
+ NULL, 0, "Route Tag", HFILL }},
+
+ };
static gint *ett[] = {
&ett_rip,
&ett_rip_vec,
};
- proto_rip = proto_register_protocol("Routing Information Protocol", "rip");
- /* proto_register_field_array(proto_rip, hf, array_length(hf));*/
+ proto_rip = proto_register_protocol("Routing Information Protocol",
+ "RIP", "rip");
+ proto_register_field_array(proto_rip, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_rip(void)
{
- old_dissector_add("udp.port", UDP_PORT_RIP, dissect_rip);
+ dissector_handle_t rip_handle;
+
+ rip_handle = create_dissector_handle(dissect_rip, proto_rip);
+ dissector_add("udp.port", UDP_PORT_RIP, rip_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff