diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
| commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
| tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-m2tp.c | |
| parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
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-m2tp.c')
| -rw-r--r-- | epan/dissectors/packet-m2tp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index 0470349b5d..ffec3e6703 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -525,8 +525,8 @@ dissect_m2tp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_item *m2tp } /* M2tp */ -static void -dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *m2tp_item; proto_tree *m2tp_tree; @@ -540,6 +540,7 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) /* dissect the message */ dissect_m2tp_message(message_tvb, pinfo, m2tp_item, m2tp_tree, tree); + return tvb_captured_length(message_tvb); } /* Register the protocol with Wireshark */ @@ -655,7 +656,7 @@ proto_reg_handoff_m2tp(void) { dissector_handle_t m2tp_handle; mtp2_handle = find_dissector("mtp2"); - m2tp_handle = create_dissector_handle(dissect_m2tp, proto_m2tp); + m2tp_handle = new_create_dissector_handle(dissect_m2tp, proto_m2tp); dissector_add_uint("sctp.ppi", M2TP_PAYLOAD_PROTOCOL_ID, m2tp_handle); dissector_add_uint("sctp.port", SCTP_PORT_M2TP, m2tp_handle); } |