aboutsummaryrefslogtreecommitdiffstats
path: root/packet-vines.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-05-30 07:41:18 +0000
committerGuy Harris <guy@alum.mit.edu>2001-05-30 07:41:18 +0000
commit9fe2133a20f5db29e507020c2bcc1b80fa35539a (patch)
tree734d11cecfaa3a668761aba609d359b58bed8421 /packet-vines.c
parentcc6b18e6abb76b86ef1316cba1890f17eed92d73 (diff)
Call the Vines IP dissector through a handle, and call the Vines SPP
dissector through a handoff table. svn path=/trunk/; revision=3479
Diffstat (limited to 'packet-vines.c')
-rw-r--r--packet-vines.c47
1 files changed, 28 insertions, 19 deletions
diff --git a/packet-vines.c b/packet-vines.c
index f51370ac69..239202730e 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.30 2001/04/23 17:51:34 guy Exp $
+ * $Id: packet-vines.c,v 1.31 2001/05/30 07:41:18 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -77,6 +77,8 @@ capture_vines(const u_char *pd, int offset, packet_counts *ld)
ld->vines++;
}
+static dissector_handle_t vines_handle;
+
/* AFAIK Vines FRP (Fragmentation Protocol) is used on all media except
* Ethernet and TR (and probably FDDI) - Fragmentation on these media types
* is not possible
@@ -142,7 +144,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Decode the "real" Vines now */
next_tvb = tvb_new_subset(tvb, 2, -1, -1);
- dissect_vines(next_tvb, pinfo, tree);
+ call_dissector(vines_handle, next_tvb, pinfo, tree);
}
void
@@ -160,6 +162,11 @@ proto_register_vines_frp(void)
void
proto_reg_handoff_vines_frp(void)
{
+ /*
+ * Get handle for the Vines dissector.
+ */
+ vines_handle = find_dissector("vines");
+
dissector_add("ip.proto", IP_PROTO_VINES, dissect_vines_frp,
proto_vines_frp);
@@ -169,6 +176,8 @@ proto_reg_handoff_vines_frp(void)
proto_vines_frp);
}
+static dissector_table_t vines_dissector_table;
+
static void
dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
@@ -182,10 +191,6 @@ dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
int hops = 0;
tvbuff_t *next_tvb;
- CHECK_DISPLAY_AS_DATA(proto_vines, tvb, pinfo, tree);
-
- pinfo->current_proto = "Vines";
-
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, "Vines");
if (check_col(pinfo->fd, COL_INFO))
@@ -309,15 +314,10 @@ dissect_vines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
offset += 18;
- switch (viph.vip_proto) {
- case VIP_PROTO_SPP:
- next_tvb = tvb_new_subset(tvb, offset, -1, -1);
- dissect_vines_spp(next_tvb, pinfo, tree);
- break;
- default:
- dissect_data(tvb, offset, pinfo, tree);
- break;
- }
+ next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+ if (!dissector_try_port(vines_dissector_table, viph.vip_proto,
+ next_tvb, pinfo, tree))
+ dissect_data(next_tvb, 0, pinfo, tree);
}
void
@@ -337,6 +337,11 @@ proto_register_vines(void)
proto_vines = proto_register_protocol("Banyan Vines", "Vines", "vines");
proto_register_field_array(proto_vines, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+
+ /* subdissector code */
+ vines_dissector_table = register_dissector_table("vines.proto");
+
+ register_dissector("vines", dissect_vines, proto_vines);
}
void
@@ -354,10 +359,6 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *vspp_tree;
proto_item *ti;
- CHECK_DISPLAY_AS_DATA(proto_vines_spp, tvb, pinfo, tree);
-
- pinfo->current_proto = "Vines SPP";
-
if (check_col(pinfo->fd, COL_PROTOCOL))
col_set_str(pinfo->fd, COL_PROTOCOL, "VSPP");
if (check_col(pinfo->fd, COL_INFO))
@@ -468,3 +469,11 @@ proto_register_vines_spp(void)
"Vines SPP", "vines_spp");
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_register_handoff_vines_spp(void)
+{
+ dissector_add("vines.proto", VIP_PROTO_SPP, dissect_vines_spp,
+ proto_vines_spp);
+}
+