diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 08:00:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 03:50:05 +0000 |
| commit | bbdd89b973353a0df1d98d884c38f3832670bfea (patch) | |
| tree | 9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-forces.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (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-forces.c')
| -rw-r--r-- | epan/dissectors/packet-forces.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index b3c9b36bc9..bd443b8366 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.c @@ -602,17 +602,19 @@ dissect_forces(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offs } /* Code to actually dissect the TCP packets */ -static void -dissect_forces_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_forces_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_forces(tvb, pinfo, tree, TCP_UDP_TML_FOCES_MESSAGE_OFFSET_TCP); + return tvb_captured_length(tvb); } /* Code to actually dissect the ForCES protocol layer packets,like UDP,SCTP and others */ -static void -dissect_forces_not_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_forces_not_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_forces(tvb, pinfo, tree, 0); + return tvb_captured_length(tvb); } void @@ -868,8 +870,8 @@ proto_reg_handoff_forces(void) static dissector_handle_t forces_handle_tcp, forces_handle; if (!inited) { - forces_handle_tcp = create_dissector_handle(dissect_forces_tcp, proto_forces); - forces_handle = create_dissector_handle(dissect_forces_not_tcp, proto_forces); + forces_handle_tcp = new_create_dissector_handle(dissect_forces_tcp, proto_forces); + forces_handle = new_create_dissector_handle(dissect_forces_not_tcp, proto_forces); ip_handle = find_dissector("ip"); inited = TRUE; } |