diff options
Diffstat (limited to 'epan/dissectors/packet-hp-erm.c')
-rw-r--r-- | epan/dissectors/packet-hp-erm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 6ff3df0a12..0582c1cd55 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -85,8 +85,8 @@ static const value_string hp_erm_cfi_vals[] = { static dissector_handle_t eth_withoutfcs_handle; -static void -dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *hp_erm_tree; @@ -112,6 +112,7 @@ dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) eth_tvb = tvb_new_subset_remaining(tvb, offset); call_dissector(eth_withoutfcs_handle, eth_tvb, pinfo, tree); + return tvb_captured_length(tvb); } void @@ -172,7 +173,7 @@ proto_reg_handoff_hp_erm(void) if (!initialized) { eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - hp_erm_handle = create_dissector_handle(dissect_hp_erm, proto_hp_erm); + hp_erm_handle = new_create_dissector_handle(dissect_hp_erm, proto_hp_erm); initialized = TRUE; } else { if (hp_erm_udp_port != 0) |