diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-23 10:56:36 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-23 17:36:39 +0000 |
| commit | 57e18b00346f86f0b5d182fcc749a1a005fadb96 (patch) | |
| tree | 9e588cfef7c1110e8f7423a550787e8c06c35e69 /epan/dissectors/packet-pop.c | |
| parent | 5afbf7e0e5c8116002cbd06abce48b410855d5e1 (diff) | |
register_dissector -> new_register_dissector
Change-Id: Ifc8208e1b96e2a3bf297912500a5f252bfa8eed9
Reviewed-on: https://code.wireshark.org/review/12073
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-pop.c')
| -rw-r--r-- | epan/dissectors/packet-pop.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c index 2d7bbbd028..f8a7948894 100644 --- a/epan/dissectors/packet-pop.c +++ b/epan/dissectors/packet-pop.c @@ -121,8 +121,8 @@ struct pop_data_val { static gboolean response_is_continuation(const guchar *data); -static void -dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { struct pop_proto_data *frame_data_p; gboolean is_request; @@ -245,7 +245,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle,tvb, pinfo, pop_tree); } - return; + return tvb_captured_length(tvb); } /* @@ -349,6 +349,7 @@ dissect_pop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = next_offset; } } + return tvb_captured_length(tvb); } static gboolean response_is_continuation(const guchar *data) @@ -447,7 +448,7 @@ proto_register_pop(void) proto_pop = proto_register_protocol("Post Office Protocol", "POP", "pop"); - register_dissector("pop", dissect_pop, proto_pop); + new_register_dissector("pop", dissect_pop, proto_pop); proto_register_field_array(proto_pop, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); register_init_routine (&pop_data_reassemble_init); |