From 0aa9e9864721d5f425ffeba85bbb642ebd12e771 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 8 Nov 2015 20:15:22 -0500 Subject: Convert some UDP subdissectors to "new" style. Change-Id: I3c1ee97f68af4539b97d50b75c03ff82147dbc5e Reviewed-on: https://code.wireshark.org/review/11649 Reviewed-by: Michael Mann --- epan/dissectors/packet-ehs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-ehs.c') diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index c7d8b4b363..6c660206a9 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -1068,8 +1068,8 @@ ehs_data_zone_dissector ( int protocol, proto_tree* ehs_tree, tvbuff_t* tvb, int /* Code to actually dissect the packets */ -static void -dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { int offset = 0; guint16 first_word; @@ -1193,6 +1193,7 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* build the ehs data zone tree for well known protocols such as AOS/LOS and UDSM */ ehs_data_zone_dissector ( protocol, ehs_tree, tvb, &offset, pinfo ); + return tvb_captured_length(tvb); } @@ -1951,7 +1952,7 @@ proto_register_ehs(void) proto_register_subtree_array(ett, array_length(ett)); /* XX: Does this dissector need to be publicly registered ?? */ - register_dissector ( "ehs", dissect_ehs, proto_ehs ); + new_register_dissector ( "ehs", dissect_ehs, proto_ehs ); } -- cgit v1.2.3