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-distcc.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-distcc.c')
| -rw-r--r-- | epan/dissectors/packet-distcc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index 02eeebf88d..96f11029b1 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -253,8 +253,8 @@ dissect_distcc_doto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off /* Packet dissection routine called by tcp (& udp) when port 3632 detected */ -static void -dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int +dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { int offset=0; proto_tree *tree=NULL; @@ -281,7 +281,7 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* scan the parameter */ if (sscanf(buf + 4, "%08x", ¶meter) != 1) - return; + return offset; if(!strncmp(buf, "DIST", 4)){ offset=dissect_distcc_dist(tvb, pinfo, tree, offset, parameter); @@ -303,11 +303,11 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) offset=dissect_distcc_doto(tvb, pinfo, tree, offset, parameter); } else { call_dissector(data_handle, tvb, pinfo, tree); - return; + return tvb_captured_length(tvb); } } - + return tvb_captured_length(tvb); } /* Register protocol with Wireshark. */ @@ -394,7 +394,7 @@ proto_reg_handoff_distcc(void) * We haven't registered the dissector yet; get a handle * for it. */ - distcc_handle = create_dissector_handle(dissect_distcc, + distcc_handle = new_create_dissector_handle(dissect_distcc, proto_distcc); data_handle = find_dissector("data"); registered_dissector = TRUE; |