/* packet-dvmrp.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for IGMP/DVMRP packet disassembly
*
- * $Id: packet-dvmrp.c,v 1.8 2002/02/01 11:01:56 guy Exp $
+ * $Id: packet-dvmrp.c,v 1.14 2003/11/16 23:17:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* 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
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
RFC1075 Version 1
draft-ietf-idmr-dvmrp-v3-10.txt Version 3
- V1 and V3 can be distinguished by looking at bytes 6 and 7 in the
+ V1 and V3 can be distinguished by looking at bytes 6 and 7 in the
IGMP/DVMRP header.
If header[6]==0xff and header[7]==0x03 we have version 3.
# include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <glib.h>
static int hf_min_ver = -1;
static int hf_maj_ver = -1;
static int hf_genid = -1;
-static int hf_naddr = -1;
static int hf_route = -1;
static int hf_saddr = -1;
static int hf_life = -1;
{DVMRP_V1_RESPONSE, "Response" },
{DVMRP_V1_REQUEST, "Request" },
{DVMRP_V1_NON_MEMBERSHIP_REPORT, "Non-membership report" },
- {DVMRP_V1_NON_MEMBERSHIP_CANCELLATION, "Non-membership cancellation" },
+ {DVMRP_V1_NON_MEMBERSHIP_CANCELLATION, "Non-membership cancellation" },
{0, NULL}
};
-#define DVMRP_V3_PROBE 1
-#define DVMRP_V3_REPORT 2
-#define DVMRP_V3_PRUNE 7
-#define DVMRP_V3_GRAFT 8
-#define DVMRP_V3_GRAFT_ACK 9
+#define DVMRP_V3_PROBE 0x1
+#define DVMRP_V3_REPORT 0x2
+#define DVMRP_V3_ASK_NEIGHBORS 0x3
+#define DVMRP_V3_NEIGHBORS 0x4
+#define DVMRP_V3_ASK_NEIGHBORS_2 0x5
+#define DVMRP_V3_NEIGHBORS_2 0x6
+#define DVMRP_V3_PRUNE 0x7
+#define DVMRP_V3_GRAFT 0x8
+#define DVMRP_V3_GRAFT_ACK 0x9
static const value_string code_v3[] = {
- {DVMRP_V3_PROBE, "Probe"},
- {DVMRP_V3_REPORT, "Report"},
- {DVMRP_V3_PRUNE, "Prune"},
- {DVMRP_V3_GRAFT, "Graft"},
- {DVMRP_V3_GRAFT_ACK, "Graft ACK"},
- {0, NULL}
+ {DVMRP_V3_PROBE, "Probe"},
+ {DVMRP_V3_REPORT, "Report"},
+ {DVMRP_V3_ASK_NEIGHBORS, "Ask Neighbors"},
+ {DVMRP_V3_NEIGHBORS, "Neighbors"},
+ {DVMRP_V3_ASK_NEIGHBORS_2, "Ask Neighbors 2"},
+ {DVMRP_V3_NEIGHBORS_2, "Neighbors 2"},
+ {DVMRP_V3_PRUNE, "Prune"},
+ {DVMRP_V3_GRAFT, "Graft"},
+ {DVMRP_V3_GRAFT_ACK, "Graft ACK"},
+ {0, NULL}
};
#define DVMRP_V3_CAP_LEAF 0x01
#define DVMRP_V3_CAP_MTRACE 0x08
#define DVMRP_V3_CAP_SNMP 0x10
#define DVMRP_V3_CAP_NETMASK 0x20
-
+
#define V1_COMMAND_NULL 0
#define V1_COMMAND_AFI 2
"NOT Netmask capable"
};
-int
-dissect_v3_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
+static int
+dissect_v3_report(tvbuff_t *tvb, proto_tree *parent_tree, int offset)
{
guint8 m0,m1,m2,m3;
guint8 s0,s1,s2,s3;
proto_item *item;
int old_offset = offset;
- item = proto_tree_add_item(parent_tree, hf_route,
+ item = proto_tree_add_item(parent_tree, hf_route,
tvb, offset, -1, FALSE);
tree = proto_item_add_subtree(item, ett_route);
ip = (ip<<8)|s2;
ip = (ip<<8)|s1;
ip = (ip<<8)|s0;
- proto_tree_add_ipv4_format(tree, hf_saddr, tvb,
+ proto_tree_add_ipv4_format(tree, hf_saddr, tvb,
old_offset, offset-old_offset, ip,
"%s %d.%d.%d.%d (netmask %d.%d.%d.%d)",
m0?"Source Network":"Default Route",
s0,s1,s2,s3,m0,m1,m2,m3);
-
+
metric = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(tree, hf_metric, tvb,
offset, 1, metric&0x7f);
return offset;
}
-int
+static int
dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
{
guint8 code,count;
offset += 1;
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO,
- "V%d %s",3 ,val_to_str(code, code_v3,
+ "V%d %s",3 ,val_to_str(code, code_v3,
"Unknown Type:0x%02x"));
}
/* skip unused byte */
offset += 1;
- /* PROBE packets have capabilities flags, unused for other packets */
- if (code==DVMRP_V3_PROBE) {
+ /* PROBE and NEIGHBORS 2 packets have capabilities flags, unused
+ for other packets */
+ if (code==DVMRP_V3_PROBE || code==DVMRP_V3_NEIGHBORS_2) {
proto_tree *tree;
proto_item *item;
- item = proto_tree_add_item(parent_tree, hf_capabilities,
+ item = proto_tree_add_item(parent_tree, hf_capabilities,
tvb, offset, 1, FALSE);
tree = proto_item_add_subtree(item, ett_capabilities);
switch (code) {
case DVMRP_V3_PROBE:
/* generation id */
- proto_tree_add_item(parent_tree, hf_genid, tvb,
+ proto_tree_add_item(parent_tree, hf_genid, tvb,
offset, 4, FALSE);
offset += 4;
while (tvb_reported_length_remaining(tvb, offset) > 0) {
- proto_tree_add_item(parent_tree, hf_neighbor,
+ proto_tree_add_item(parent_tree, hf_neighbor,
tvb, offset, 4, FALSE);
offset += 4;
}
break;
case DVMRP_V3_REPORT:
- offset = dissect_v3_report(tvb, pinfo, parent_tree, offset);
+ offset = dissect_v3_report(tvb, parent_tree, offset);
break;
case DVMRP_V3_PRUNE:
/* source address */
- proto_tree_add_item(parent_tree, hf_saddr,
+ proto_tree_add_item(parent_tree, hf_saddr,
tvb, offset, 4, FALSE);
offset += 4;
/* group address */
- proto_tree_add_item(parent_tree, hf_maddr,
+ proto_tree_add_item(parent_tree, hf_maddr,
tvb, offset, 4, FALSE);
offset += 4;
/* prune lifetime */
- proto_tree_add_item(parent_tree, hf_life,
+ proto_tree_add_item(parent_tree, hf_life,
tvb, offset, 4, FALSE);
offset += 4;
/* source netmask */
break;
case DVMRP_V3_GRAFT:
/* source address */
- proto_tree_add_item(parent_tree, hf_saddr,
+ proto_tree_add_item(parent_tree, hf_saddr,
tvb, offset, 4, FALSE);
offset += 4;
/* group address */
- proto_tree_add_item(parent_tree, hf_maddr,
+ proto_tree_add_item(parent_tree, hf_maddr,
tvb, offset, 4, FALSE);
offset += 4;
/* source netmask */
if (tvb_reported_length_remaining(tvb, offset)>=4) {
- proto_tree_add_item(parent_tree, hf_netmask,
+ proto_tree_add_item(parent_tree, hf_netmask,
tvb, offset, 4, FALSE);
offset += 4;
}
break;
case DVMRP_V3_GRAFT_ACK:
/* source address */
- proto_tree_add_item(parent_tree, hf_saddr,
+ proto_tree_add_item(parent_tree, hf_saddr,
tvb, offset, 4, FALSE);
offset += 4;
/* group address */
- proto_tree_add_item(parent_tree, hf_maddr,
+ proto_tree_add_item(parent_tree, hf_maddr,
tvb, offset, 4, FALSE);
offset += 4;
/* source netmask */
if (tvb_reported_length_remaining(tvb, offset)>=4) {
- proto_tree_add_item(parent_tree, hf_netmask,
+ proto_tree_add_item(parent_tree, hf_netmask,
tvb, offset, 4, FALSE);
offset += 4;
}
break;
+ case DVMRP_V3_ASK_NEIGHBORS:
+ case DVMRP_V3_NEIGHBORS:
+ /* XXX - obsolete, and the draft doesn't describe them */
+ break;
+ case DVMRP_V3_ASK_NEIGHBORS_2:
+ /* No data */
+ break;
+ case DVMRP_V3_NEIGHBORS_2:
+ /* XXX - fill this in */
+ break;
}
return offset;
}
-
-int
+
+static int
dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
{
guint8 code;
offset += 1;
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO,
- "V%d %s",1 ,val_to_str(code, code_v1,
+ "V%d %s",1 ,val_to_str(code, code_v1,
"Unknown Type:0x%02x"));
}
guint8 cmd,count;
int old_offset = offset;
- item = proto_tree_add_item(parent_tree, hf_commands,
+ item = proto_tree_add_item(parent_tree, hf_commands,
tvb, offset, -1, FALSE);
tree = proto_item_add_subtree(item, ett_commands);
val_to_str(af, afi, "Unknown Family:0x%02x")
);
}
- break;
+ break;
case V1_COMMAND_SUBNETMASK:
count = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(tree, hf_count, tvb,
offset, 1, count);
offset += 1;
if (count) { /* must be 0 or 1 */
- proto_tree_add_item(tree, hf_netmask,
+ proto_tree_add_item(tree, hf_netmask,
tvb, offset, 4, FALSE);
if (item) {
proto_item_set_text(item, "%s: %d.%d.%d.%d",
- val_to_str(cmd, command, "Unknown Command:0x%02x"),
+ val_to_str(cmd, command, "Unknown Command:0x%02x"),
tvb_get_guint8(tvb, offset),
tvb_get_guint8(tvb, offset+1),
tvb_get_guint8(tvb, offset+2),
val_to_str(cmd, command, "Unknown Command:0x%02x"));
}
}
- break;
+ break;
case V1_COMMAND_METRIC:
proto_tree_add_item(tree, hf_metric, tvb,
offset, 1, FALSE);
if (item) {
proto_item_set_text(item, "%s: %d",
- val_to_str(cmd, command, "Unknown Command:0x%02x"),
+ val_to_str(cmd, command, "Unknown Command:0x%02x"),
tvb_get_guint8(tvb, offset));
}
offset += 1;
- break;
+ break;
case V1_COMMAND_FLAGS0:
count = tvb_get_guint8(tvb, offset);
proto_tree_add_boolean(tree, hf_dest_unr, tvb, offset, 1, count);
val_to_str(cmd, command, "Unknown Command:0x%02x"), tvb_get_guint8(tvb, offset));
}
offset += 1;
- break;
+ break;
case V1_COMMAND_DA:
case V1_COMMAND_RDA: /* same as DA */
count = tvb_get_guint8(tvb, offset);
offset, 1, count);
offset += 1;
while (count--) {
- proto_tree_add_item(tree, hf_daddr,
+ proto_tree_add_item(tree, hf_daddr,
tvb, offset, 4, FALSE);
offset += 4;
}
proto_item_set_text(item, "%s",
val_to_str(cmd, command, "Unknown Command:0x%02x"));
}
- break;
+ break;
case V1_COMMAND_NMR:
count = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(tree, hf_count, tvb,
offset, 1, count);
offset += 1;
while (count--) {
- proto_tree_add_item(tree, hf_maddr,
+ proto_tree_add_item(tree, hf_maddr,
tvb, offset, 4, FALSE);
offset += 4;
proto_tree_add_item(tree, hf_hold, tvb,
proto_item_set_text(item, "%s",
val_to_str(cmd, command, "Unknown Command:0x%02x"));
}
- break;
+ break;
case V1_COMMAND_NMR_CANCEL:
count = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(tree, hf_count, tvb,
offset, 1, count);
offset += 1;
while (count--) {
- proto_tree_add_item(tree, hf_maddr,
+ proto_tree_add_item(tree, hf_maddr,
tvb, offset, 4, FALSE);
offset += 4;
}
proto_item_set_text(item, "%s",
val_to_str(cmd, command, "Unknown Command:0x%02x"));
}
- break;
+ break;
}
proto_item_set_len(item, offset-old_offset);
proto_tree *tree;
proto_item *item;
- if (!proto_is_protocol_enabled(proto_dvmrp)) {
+ if (!proto_is_protocol_enabled(find_protocol_by_id(proto_dvmrp))) {
/* we are not enabled, skip entire packet to be nice
to the igmp layer. (so clicking on IGMP will display the data)
*/
return offset;
}
-
+
offset = dissect_dvmrp_v1(tvb, pinfo, tree, offset);
proto_item_set_len(item, offset);
return offset;
{ "Generation ID", "dvmrp.genid", FT_UINT32, BASE_DEC,
NULL, 0, "DVMRP Generation ID", HFILL }},
- { &hf_naddr,
- { "Neighbor Addr", "igmp.naddr", FT_IPv4, BASE_NONE,
- NULL, 0, "DVMRP Neighbor Address", HFILL }},
-
{ &hf_route,
{ "Route", "dvmrp.route", FT_NONE, BASE_NONE,
NULL, 0, "DVMRP V3 Route Report", HFILL }},
git.samba.org / obnox / wireshark / wip.git / blobdiff