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-asterix.c | |
| parent | 8f529628338f20948e80835076b7b18f6d48c6cf (diff) | |
| download | wireshark-0aa9e9864721d5f425ffeba85bbb642ebd12e771.tar.gz | |
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-asterix.c')
| -rw-r--r-- | epan/dissectors/packet-asterix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index c8ebc17f9f..4f0e5fb59a 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -2703,7 +2703,6 @@ struct AsterixField_s { }; DIAG_ON(pedantic) -static void dissect_asterix (tvbuff_t *, packet_info *, proto_tree *); static void dissect_asterix_packet (tvbuff_t *, proto_tree *); static void dissect_asterix_data_block (tvbuff_t *tvb, guint, proto_tree *, guint8, gint); static gint dissect_asterix_fields (tvbuff_t *, guint, proto_tree *, guint8, const AsterixField *[]); @@ -8226,7 +8225,7 @@ static const AsterixField ****categories[] = { }; -static void dissect_asterix (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_asterix (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { col_set_str (pinfo->cinfo, COL_PROTOCOL, "ASTERIX"); col_clear (pinfo->cinfo, COL_INFO); @@ -8234,6 +8233,8 @@ static void dissect_asterix (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree if (tree) { /* we are being asked for details */ dissect_asterix_packet (tvb, tree); } + + return tvb_captured_length(tvb); } static void dissect_asterix_packet (tvbuff_t *tvb, proto_tree *tree) @@ -11171,7 +11172,7 @@ void proto_register_asterix (void) proto_register_field_array (proto_asterix, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - asterix_handle = register_dissector ("asterix", dissect_asterix, proto_asterix); + asterix_handle = new_register_dissector ("asterix", dissect_asterix, proto_asterix); asterix_prefs_module = prefs_register_protocol (proto_asterix, proto_reg_handoff_asterix); |