aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dvb-ipdc.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-09 23:01:28 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-13 17:44:24 +0000
commit01f7356f85d33567a25e722e6488addd72ff64d4 (patch)
tree2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-dvb-ipdc.c
parentb776707af540d7431e815818e21ea1efac326d9f (diff)
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8 Reviewed-on: https://code.wireshark.org/review/11805 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dvb-ipdc.c')
-rw-r--r--epan/dissectors/packet-dvb-ipdc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c
index aa5064930f..be8a417e91 100644
--- a/epan/dissectors/packet-dvb-ipdc.c
+++ b/epan/dissectors/packet-dvb-ipdc.c
@@ -48,8 +48,8 @@ static dissector_handle_t sub_handles[DVB_IPDC_SUB_MAX];
/* Code to actually dissect the packets */
-static void
-dissect_ipdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_ipdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
tvbuff_t *next_tvb;
proto_tree *esg_tree = NULL;
@@ -68,6 +68,7 @@ dissect_ipdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
next_tvb = tvb_new_subset_remaining(tvb, 0);
call_dissector(sub_handles[DVB_IPDC_SUB_FLUTE], next_tvb, pinfo, esg_tree);
+ return tvb_captured_length(tvb);
}
void
@@ -92,7 +93,7 @@ proto_register_dvb_ipdc(void)
#endif
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("dvb_ipdc", dissect_ipdc, proto_ipdc);
+ new_register_dissector("dvb_ipdc", dissect_ipdc, proto_ipdc);
}
void
@@ -102,7 +103,7 @@ proto_reg_handoff_dvb_ipdc(void)
sub_handles[DVB_IPDC_SUB_FLUTE] = find_dissector("alc");
- ipdc_handle = create_dissector_handle(dissect_ipdc, proto_ipdc);
+ ipdc_handle = new_create_dissector_handle(dissect_ipdc, proto_ipdc);
dissector_add_uint("udp.port", UDP_PORT_IPDC_ESG_BOOTSTRAP, ipdc_handle);
}