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-ceph.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (diff) | |
| download | wireshark-bbdd89b973353a0df1d98d884c38f3832670bfea.tar.gz | |
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-ceph.c')
| -rw-r--r-- | epan/dissectors/packet-ceph.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index a83689238d..f67a9c446a 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -7079,9 +7079,10 @@ int dissect_ceph(tvbuff_t *tvb, packet_info *pinfo, * Proxies the old style dissector interface to the new style. */ static -void dissect_ceph_old(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +int dissect_ceph_old(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - dissect_ceph(tvb, pinfo, tree, NULL); + dissect_ceph(tvb, pinfo, tree, data); + return tvb_captured_length(tvb); } static @@ -10513,7 +10514,7 @@ proto_register_ceph(void) void proto_reg_handoff_ceph(void) { - ceph_handle = create_dissector_handle(dissect_ceph_old, proto_ceph); + ceph_handle = new_create_dissector_handle(dissect_ceph_old, proto_ceph); heur_dissector_add("tcp", dissect_ceph_heur, "Ceph over TCP", "ceph_tcp", proto_ceph, HEURISTIC_ENABLE); } |