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-p1.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-p1.c')
| -rw-r--r-- | epan/dissectors/packet-p1.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 35e2bbfe14..747dc61c37 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -8508,8 +8508,8 @@ const char* p1_get_last_oraddress (asn1_ctx_t* actx) /* * Dissect P1 MTS APDU */ -void -dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +int +dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -8529,6 +8529,7 @@ dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dissect_p1_MTS_APDU (FALSE, tvb, 0, &asn1_ctx, tree, hf_p1_MTS_APDU_PDU); p1_initialize_content_globals (&asn1_ctx, NULL, FALSE); + return tvb_captured_length(tvb); } /* @@ -10880,7 +10881,7 @@ void proto_register_p1(void) { NULL, HFILL }}, /*--- End of included file: packet-p1-hfarr.c ---*/ -#line 336 "../../asn1/p1/packet-p1-template.c" +#line 337 "../../asn1/p1/packet-p1-template.c" }; /* List of subtrees */ @@ -11077,7 +11078,7 @@ void proto_register_p1(void) { &ett_p1_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, /*--- End of included file: packet-p1-ettarr.c ---*/ -#line 349 "../../asn1/p1/packet-p1-template.c" +#line 350 "../../asn1/p1/packet-p1-template.c" }; static ei_register_info ei[] = { @@ -11117,7 +11118,7 @@ void proto_register_p1(void) { " than the default of 102)", 10, &global_p1_tcp_port); - register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); + new_register_ber_syntax_dissector("P1 Message", proto_p1, dissect_p1_mts_apdu); /*--- Included file: packet-p1-syn-reg.c ---*/ #line 1 "../../asn1/p1/packet-p1-syn-reg.c" @@ -11126,7 +11127,7 @@ void proto_register_p1(void) { new_register_ber_syntax_dissector("ORName", proto_p1, dissect_ORName_PDU); /*--- End of included file: packet-p1-syn-reg.c ---*/ -#line 390 "../../asn1/p1/packet-p1-template.c" +#line 391 "../../asn1/p1/packet-p1-template.c" } @@ -11292,7 +11293,7 @@ void proto_reg_handoff_p1(void) { /*--- End of included file: packet-p1-dis-tab.c ---*/ -#line 398 "../../asn1/p1/packet-p1-template.c" +#line 399 "../../asn1/p1/packet-p1-template.c" /* APPLICATION CONTEXT */ |