diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
| commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
| tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-ismacryp.c | |
| parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
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-ismacryp.c')
| -rw-r--r-- | epan/dissectors/packet-ismacryp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index aa9dd41c90..9f27142577 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -210,7 +210,7 @@ static gint ett_ismacryp_message = -1; */ /* dissect_ismacryp_v11 gets called if rtp_dyn_payload_type = "enc-mpeg4-generic" i.e. is set via SDP */ -static void dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* display ISMACryp version */ col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_11); @@ -219,10 +219,11 @@ static void dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_set_str(pinfo->cinfo, COL_INFO, "(PT=enc-mpeg4-generic)"); dissect_ismacryp_common( tvb, pinfo, tree, V11); + return tvb_captured_length(tvb); } /* dissect_ismacryp_v20 gets called if rtp_dyn_payload_type = "enc-isoff-generic" i.e. is set via SDP */ -static void dissect_ismacryp_v20(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_ismacryp_v20(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* display ISMACryp version */ col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_20); @@ -231,12 +232,14 @@ static void dissect_ismacryp_v20(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_set_str(pinfo->cinfo, COL_INFO, "(PT=enc-isoff-generic)"); dissect_ismacryp_common( tvb, pinfo, tree, V20); + return tvb_captured_length(tvb); } -static void dissect_ismacryp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_ismacryp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { col_set_str(pinfo->cinfo, COL_INFO, "Manual version"); dissect_ismacryp_common( tvb, pinfo, tree, version_type); /* Unknown version type: Use preference */ + return tvb_captured_length(tvb); } static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint ismacryp_version) @@ -1004,9 +1007,9 @@ void proto_reg_handoff_ismacryp(void) if (!ismacryp_prefs_initialized) { dissector_handle_t ismacryp_v11_handle; dissector_handle_t ismacryp_v20_handle; - ismacryp_handle = create_dissector_handle(dissect_ismacryp, proto_ismacryp); - ismacryp_v11_handle = create_dissector_handle(dissect_ismacryp_v11, proto_ismacryp); - ismacryp_v20_handle = create_dissector_handle(dissect_ismacryp_v20, proto_ismacryp); + ismacryp_handle = new_create_dissector_handle(dissect_ismacryp, proto_ismacryp); + ismacryp_v11_handle = new_create_dissector_handle(dissect_ismacryp_v11, proto_ismacryp); + ismacryp_v20_handle = new_create_dissector_handle(dissect_ismacryp_v20, proto_ismacryp); ismacryp_prefs_initialized = TRUE; dissector_add_string("rtp_dyn_payload_type", "ISMACRYP", ismacryp_handle); dissector_add_string("rtp_dyn_payload_type", "enc-mpeg4-generic", ismacryp_v11_handle); |