diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-24 13:13:18 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-25 19:21:14 +0000 |
| commit | 0cd1a8506425fa379c88df941e3039ce9a1164d4 (patch) | |
| tree | 9c2cb1edbaf7de9fa028e4b05fcc13f491a4230b /epan/dissectors/packet-ftam.c | |
| parent | 992a7ee6e7603c2552971dc516ca4e6c45ae2d21 (diff) | |
Require BER dissector (OID) registration to be "new style".
Both old and new style API existed, just remove the "old" one.
Change-Id: If725e778a0ecad5a431d634ed5c4856b4a281013
Reviewed-on: https://code.wireshark.org/review/12107
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ftam.c')
| -rw-r--r-- | epan/dissectors/packet-ftam.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 12d284406c..a31fadc088 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -4748,19 +4748,21 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /* * Dissect FTAM unstructured text */ -static void -dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) +static int +dissect_ftam_unstructured_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree, void* data _U_) { proto_tree_add_item (parent_tree, hf_ftam_unstructured_text, tvb, 0, tvb_reported_length_remaining(tvb, 0), ENC_ASCII|ENC_NA); + return tvb_captured_length(tvb); } /* * Dissect FTAM unstructured binary */ -static void -dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) +static int +dissect_ftam_unstructured_binary(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree, void* data _U_) { proto_tree_add_item (parent_tree, hf_ftam_unstructured_binary, tvb, 0, tvb_reported_length_remaining(tvb, 0), ENC_NA); + return tvb_captured_length(tvb); } /* @@ -6469,7 +6471,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 129 "../../asn1/ftam/packet-ftam-template.c" +#line 131 "../../asn1/ftam/packet-ftam-template.c" }; /* List of subtrees */ @@ -6642,7 +6644,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 135 "../../asn1/ftam/packet-ftam-template.c" +#line 137 "../../asn1/ftam/packet-ftam-template.c" }; static ei_register_info ei[] = { { &ei_ftam_zero_pdu, { "ftam.zero_pdu", PI_PROTOCOL, PI_ERROR, "Internal error, zero-byte FTAM PDU", EXPFILL }}, @@ -6669,7 +6671,7 @@ void proto_reg_handoff_ftam(void) { new_register_ber_oid_dissector("1.3.14.5.2.2", dissect_ftam, proto_ftam,"NIST file directory entry abstract syntax"); /* Unstructured text file document type FTAM-1 */ - register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); + new_register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"ISO FTAM unstructured text"); oid_add_from_string("ISO FTAM sequential text","1.0.8571.5.2"); oid_add_from_string("FTAM unstructured text abstract syntax","1.0.8571.2.3"); oid_add_from_string("FTAM simple-hierarchy","1.0.8571.2.5"); @@ -6677,7 +6679,7 @@ void proto_reg_handoff_ftam(void) { oid_add_from_string("FTAM unstructured constraint set","1.0.8571.4.1"); /* Unstructured binary file document type FTAM-3 */ - register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); + new_register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); oid_add_from_string("FTAM unstructured binary abstract syntax","1.0.8571.2.4"); /* Filedirectory file document type NBS-9 */ |