From dcfea6a06ddf7adeafc8613efe74310251201789 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 24 Nov 2015 21:59:51 -0500 Subject: create_dissector_handle -> new_create_dissector_handle This finalizes the transformation for dissectors. Change-Id: Ie5986b72bb69a6e8779ca3f5e20a80357c9e6fea Reviewed-on: https://code.wireshark.org/review/12122 Petri-Dish: Michael Mann Reviewed-by: Michael Mann --- epan/dissectors/packet-symantec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-symantec.c') diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 94dc8c7009..7d8fbc376e 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -39,8 +39,8 @@ static int hf_symantec_etype = -1; static gint ett_symantec = -1; -static void -dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *symantec_tree; @@ -73,7 +73,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* a valid packet can't be both v2 and v3 or neither v2 nor v3, */ if ((etypev2 == 0) == (etypev3 == 0)) - return; + return 12; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Symantec"); @@ -113,6 +113,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissector_try_uint(ethertype_dissector_table, etypev3, next_tvb, pinfo, tree); } + return tvb_captured_length(tvb); } void @@ -143,7 +144,7 @@ proto_reg_handoff_symantec(void) ethertype_dissector_table = find_dissector_table("ethertype"); - symantec_handle = create_dissector_handle(dissect_symantec, + symantec_handle = new_create_dissector_handle(dissect_symantec, proto_symantec); dissector_add_uint("wtap_encap", WTAP_ENCAP_SYMANTEC, symantec_handle); } -- cgit v1.2.3