aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_ipa.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-15 08:00:10 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-16 03:50:05 +0000
commitbbdd89b973353a0df1d98d884c38f3832670bfea (patch)
tree9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-gsm_ipa.c
parent6012ba8f008bfba24fd44ce7a2a3055572453dce (diff)
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48 Reviewed-on: https://code.wireshark.org/review/11850 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-gsm_ipa.c')
-rw-r--r--epan/dissectors/packet-gsm_ipa.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index d203638759..f4c3bb1527 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -370,16 +370,18 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_udp
}
}
-static void
-dissect_ipa_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_ipa_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
dissect_ipa(tvb, pinfo, tree, FALSE);
+ return tvb_captured_length(tvb);
}
-static void
-dissect_ipa_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_ipa_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
dissect_ipa(tvb, pinfo, tree, TRUE);
+ return tvb_captured_length(tvb);
}
void proto_register_ipa(void)
@@ -492,8 +494,8 @@ void proto_reg_handoff_gsm_ipa(void)
sub_handles[SUB_MGCP] = find_dissector("mgcp");
sub_handles[SUB_DATA] = find_dissector("data");
- ipa_tcp_handle = create_dissector_handle(dissect_ipa_tcp, proto_ipa);
- ipa_udp_handle = create_dissector_handle(dissect_ipa_udp, proto_ipa);
+ ipa_tcp_handle = new_create_dissector_handle(dissect_ipa_tcp, proto_ipa);
+ ipa_udp_handle = new_create_dissector_handle(dissect_ipa_udp, proto_ipa);
ipa_initialized = TRUE;
} else {
dissector_delete_uint_range("tcp.port", ipa_tcp_ports, ipa_tcp_handle);