diff options
author | Michael Mann <mmann78@netscape.net> | 2015-11-08 20:15:22 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-09 15:59:42 +0000 |
commit | 0aa9e9864721d5f425ffeba85bbb642ebd12e771 (patch) | |
tree | 98918da5fd1c719a3ca17b6df2369a663ed66550 /epan/dissectors/packet-nwmtp.c | |
parent | 8f529628338f20948e80835076b7b18f6d48c6cf (diff) |
Convert some UDP subdissectors to "new" style.
Change-Id: I3c1ee97f68af4539b97d50b75c03ff82147dbc5e
Reviewed-on: https://code.wireshark.org/review/11649
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-nwmtp.c')
-rw-r--r-- | epan/dissectors/packet-nwmtp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c index 9b4402bb08..8a75f8601d 100644 --- a/epan/dissectors/packet-nwmtp.c +++ b/epan/dissectors/packet-nwmtp.c @@ -64,7 +64,7 @@ static const value_string nwmtp_data_type_vals[] = { { 0, NULL }, }; -static void dissect_nwmtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_nwmtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { gint offset = 0; @@ -114,6 +114,8 @@ static void dissect_nwmtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) DISSECTOR_ASSERT((guint64)offset + len + 12 < G_MAXINT); offset += len + 12; } + + return tvb_captured_length(tvb); } void proto_register_mwmtp(void) @@ -156,7 +158,7 @@ void proto_register_mwmtp(void) proto_register_field_array(proto_nwmtp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - nwmtp_handle = register_dissector("nw_mtp", dissect_nwmtp, proto_nwmtp); + nwmtp_handle = new_register_dissector("nw_mtp", dissect_nwmtp, proto_nwmtp); } void proto_reg_handoff_nwmtp(void) |