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 /asn1/p1 | |
| 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 'asn1/p1')
| -rw-r--r-- | asn1/p1/packet-p1-template.c | 7 | ||||
| -rw-r--r-- | asn1/p1/packet-p1-template.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index c4da37c0d5..5110c49d2e 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -209,8 +209,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; @@ -230,6 +230,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); } /* @@ -385,7 +386,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); #include "packet-p1-syn-reg.c" } diff --git a/asn1/p1/packet-p1-template.h b/asn1/p1/packet-p1-template.h index d28fd05658..b8463f8340 100644 --- a/asn1/p1/packet-p1-template.h +++ b/asn1/p1/packet-p1-template.h @@ -28,7 +28,7 @@ void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean report_unknown_cont_type); const char* p1_get_last_oraddress(asn1_ctx_t* actx); -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); #include "packet-p1-exp.h" void proto_reg_handoff_p1(void); |