diff options
author | Michael Mann <mmann78@netscape.net> | 2015-11-08 19:30:18 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-09 15:59:59 +0000 |
commit | 2fe0fc5a1afbbd8218190736decbecec14582691 (patch) | |
tree | a5d7860915c351039bbb16979f0a05532533a276 /epan/dissectors/packet-synergy.c | |
parent | 0aa9e9864721d5f425ffeba85bbb642ebd12e771 (diff) |
Convert some TCP subdissectors to "new" style.
Change-Id: I28ce51f3c06f78b85792bce4a13ef39eb75d7890
Reviewed-on: https://code.wireshark.org/review/11648
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-synergy.c')
-rw-r--r-- | epan/dissectors/packet-synergy.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index b8425e00c8..473ed6adc8 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -135,8 +135,8 @@ static void dissect_synergy_eicv(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* Code to actually dissect the packets */ -static void -dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "synergy"); @@ -205,7 +205,9 @@ dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(synergy_tree,hf_synergy_ebad,tvb,offset+4,-1,ENC_NA); else proto_tree_add_item(synergy_tree,hf_synergy_unknown,tvb,offset+4,-1,ENC_NA); - } + } + + return tvb_captured_length(tvb); } static void dissect_synergy_handshake( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset ) @@ -560,7 +562,7 @@ proto_register_synergy(void) /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_synergy, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("synergy", dissect_synergy, proto_synergy); + new_register_dissector("synergy", dissect_synergy, proto_synergy); } void |