diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-06 15:31:47 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 11:24:07 +0000 |
| commit | 4e1b5ea866dd332294246c4800efe77431010ad8 (patch) | |
| tree | 8cda568a450b29fd7bbfcbbf03d840ab9f123190 /asn1 | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
| download | wireshark-4e1b5ea866dd332294246c4800efe77431010ad8.tar.gz | |
ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'asn1')
87 files changed, 202 insertions, 201 deletions
diff --git a/asn1/HI2Operations/HI2Operations.cnf b/asn1/HI2Operations/HI2Operations.cnf index e7ca5113d3..d2c191478c 100644 --- a/asn1/HI2Operations/HI2Operations.cnf +++ b/asn1/HI2Operations/HI2Operations.cnf @@ -10,9 +10,9 @@ EN301040 EN301040 #.EXPORTS -#.REGISTER +#.REGISTER_NEW -#.PDU +#.PDU_NEW IRIsContent #.NO_EMIT diff --git a/asn1/HI2Operations/packet-HI2Operations-template.c b/asn1/HI2Operations/packet-HI2Operations-template.c index c3e44786ad..e1d29a6f17 100644 --- a/asn1/HI2Operations/packet-HI2Operations-template.c +++ b/asn1/HI2Operations/packet-HI2Operations-template.c @@ -68,7 +68,7 @@ void proto_register_HI2Operations(void) { proto_register_field_array(proto_HI2Operations, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations); + new_register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations); } diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf index 194a10df4d..40ff196cc1 100644 --- a/asn1/acp133/acp133.cnf +++ b/asn1/acp133/acp133.cnf @@ -7,7 +7,7 @@ #.IMPORT ../x509if/x509if-exp.cnf #.IMPORT ../x509sat/x509sat-exp.cnf -#.PDU +#.PDU_NEW ACPPreferredDelivery ALType Community @@ -65,7 +65,7 @@ Kmid &id ObjectIdentifierType #.END -#.REGISTER +#.REGISTER_NEW # X.402 diff --git a/asn1/atn-cm/atn-cm.cnf b/asn1/atn-cm/atn-cm.cnf index e38195f1c4..38e23bc0bd 100644 --- a/asn1/atn-cm/atn-cm.cnf +++ b/asn1/atn-cm/atn-cm.cnf @@ -6,7 +6,7 @@ #.EXPORTS -#.PDU +#.PDU_NEW CMAircraftMessage CMGroundMessage #.END diff --git a/asn1/atn-cm/packet-atn-cm-template.c b/asn1/atn-cm/packet-atn-cm-template.c index a514322004..22889c64a3 100644 --- a/asn1/atn-cm/packet-atn-cm-template.c +++ b/asn1/atn-cm/packet-atn-cm-template.c @@ -91,13 +91,13 @@ dissect_atn_cm( dissect_CMGroundMessage_PDU( tvb, pinfo, - sub_tree); + sub_tree, NULL); break; case dm: dissect_CMAircraftMessage_PDU( tvb, pinfo, - sub_tree); + sub_tree, NULL); break; default: break; @@ -126,7 +126,7 @@ dissect_atn_cm_heur( dissect_CMGroundMessage_PDU( tvb, pinfo, - NULL); + NULL, NULL); /* no exception thrown: looks like it is a CM PDU */ is_atn_cm = TRUE; } CATCH_ALL { @@ -138,7 +138,7 @@ dissect_atn_cm_heur( dissect_CMAircraftMessage_PDU( tvb, pinfo, - NULL); + NULL, NULL); /* no exception thrown: looks like it is a CM PDU */ is_atn_cm = TRUE;} CATCH_ALL { diff --git a/asn1/atn-cpdlc/atn-cpdlc.cnf b/asn1/atn-cpdlc/atn-cpdlc.cnf index bd31909c54..b1ef6efb53 100644 --- a/asn1/atn-cpdlc/atn-cpdlc.cnf +++ b/asn1/atn-cpdlc/atn-cpdlc.cnf @@ -11,7 +11,7 @@ #.OMIT_ASSIGNMENT #.END -#.PDU +#.PDU_NEW AircraftPDUs GroundPDUs ProtectedAircraftPDUs diff --git a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c index 61e51a287d..ddc09c0bba 100644 --- a/asn1/atn-cpdlc/packet-atn-cpdlc-template.c +++ b/asn1/atn-cpdlc/packet-atn-cpdlc-template.c @@ -69,22 +69,26 @@ void proto_reg_handoff_atn_cpdlc(void); static const char *object_identifier_id; /* forward declarations */ -static void dissect_GroundPDUs_PDU( +static int dissect_GroundPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); -static void dissect_AircraftPDUs_PDU( + proto_tree *tree _U_, + void *data _U_); +static int dissect_AircraftPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); -static void dissect_ProtectedGroundPDUs_PDU( + proto_tree *tree _U_, + void *data _U_); +static int dissect_ProtectedGroundPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); -static void dissect_ProtectedAircraftPDUs_PDU( + proto_tree *tree _U_, + void *data _U_); +static int dissect_ProtectedAircraftPDUs_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); + proto_tree *tree _U_, + void *data _U_); #include "packet-atn-cpdlc-hf.c" @@ -172,12 +176,12 @@ dissect_atn_cpdlc( dissect_ProtectedGroundPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); }else { /* downlink PDU's = Aircraft PDU's */ dissect_ProtectedAircraftPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); } break; case cpdlc: @@ -186,12 +190,12 @@ dissect_atn_cpdlc( dissect_GroundPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); }else { /* downlink PDU's = Aircraft PDU's */ dissect_AircraftPDUs_PDU( tvb, pinfo, - atn_cpdlc_tree); + atn_cpdlc_tree, NULL); } break; default: @@ -217,7 +221,7 @@ dissect_atn_cpdlc_heur( switch(type){ case um: TRY { - dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL); + dissect_ProtectedGroundPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; is_pm = TRUE; break;} @@ -226,7 +230,7 @@ dissect_atn_cpdlc_heur( is_pm = FALSE;} ENDTRY; TRY { - dissect_GroundPDUs_PDU(tvb, pinfo, NULL); + dissect_GroundPDUs_PDU(tvb, pinfo, NULL, NULL); is_pm = FALSE; is_atn_cpdlc = TRUE; break;} @@ -237,7 +241,7 @@ dissect_atn_cpdlc_heur( break; case dm: TRY { - dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL); + dissect_ProtectedAircraftPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; is_pm = TRUE; break;} @@ -246,7 +250,7 @@ dissect_atn_cpdlc_heur( is_pm = FALSE; } ENDTRY; TRY{ - dissect_AircraftPDUs_PDU(tvb, pinfo, NULL); + dissect_AircraftPDUs_PDU(tvb, pinfo, NULL, NULL); is_atn_cpdlc = TRUE; is_pm = FALSE; break;} diff --git a/asn1/atn-ulcs/atn-ulcs.cnf b/asn1/atn-ulcs/atn-ulcs.cnf index 5584b50e14..fce5459851 100644 --- a/asn1/atn-ulcs/atn-ulcs.cnf +++ b/asn1/atn-ulcs/atn-ulcs.cnf @@ -16,7 +16,7 @@ PDV-list/presentation-data-values/single-ASN1-type pdv-list_presentation-data-va PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_arbitrary #.END -#.PDU +#.PDU_NEW Fully-encoded-data ACSE-apdu #.END @@ -74,7 +74,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar dissect_ACSE_apdu_PDU( tvb_new_subset_remaining(tvb_usr, 0), pinfo, - atn_ulcs_tree); + atn_ulcs_tree, NULL); break; case 3: /* USER data; call subdissector for CM, CPDLC ... */ diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 51e51d545c..c5af4a642b 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -174,10 +174,11 @@ static int dissect_atn_ulcs_T_externalt_encoding_arbitrary( proto_tree *tree _U_, int hf_index _U_); -static void dissect_ACSE_apdu_PDU( +static int dissect_ACSE_apdu_PDU( tvbuff_t *tvb _U_, packet_info *pinfo _U_, - proto_tree *tree _U_); + proto_tree *tree _U_, + void *data _U_); guint32 dissect_per_object_descriptor_t( tvbuff_t *tvb, @@ -604,7 +605,7 @@ dissect_atn_ulcs( dissect_Fully_encoded_data_PDU( tvb, pinfo, - atn_ulcs_tree); + atn_ulcs_tree, NULL); return offset + tvb_reported_length_remaining(tvb, offset ) ; @@ -712,7 +713,7 @@ dissect_atn_ulcs( dissect_ACSE_apdu_PDU( tvb_new_subset_remaining(tvb, offset), pinfo, - atn_ulcs_tree); + atn_ulcs_tree, NULL); return offset + tvb_reported_length_remaining(tvb, offset ); diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf index d3d4fb8da5..fdf4c3e244 100644 --- a/asn1/c1222/c1222.cnf +++ b/asn1/c1222/c1222.cnf @@ -7,7 +7,7 @@ IMPORT ../acse/acse.inf #.EXPORTS -#.PDU +#.PDU_NEW MESSAGE #.NO_EMIT diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index 266db5e867..3b677cf474 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -1066,13 +1066,9 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); /* create the c1222 protocol tree */ - if (tree) { - c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA); - c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222); - dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree); - } - - return tvb_captured_length(tvb); + c1222_item = proto_tree_add_item(tree, proto_c1222, tvb, 0, -1, ENC_NA); + c1222_tree = proto_item_add_subtree(c1222_item, ett_c1222); + return dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree, NULL); } /** diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 25ebc2f68c..1d73437289 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -41,7 +41,7 @@ OPERATION.&ResultType #.END -#.REGISTER +#.REGISTER_NEW CAP-GPRS-ReferenceNumber B "0.4.0.0.1.1.5.2" "id-CAP-GPRS-ReferenceNumber" CAP-U-ABORT-REASON B "0.4.0.0.1.1.2.2" "id-CAP-U-ABORT-Reason" diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf index d26d8d3b31..071524269c 100644 --- a/asn1/cdt/cdt.cnf +++ b/asn1/cdt/cdt.cnf @@ -4,7 +4,7 @@ #.EXPORTS CompressedData -#.REGISTER +#.REGISTER_NEW CompressedData B "1.3.26.0.4406.0.4.2" "cdt" #.FN_BODY CompressedData diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c index 71fb4d5c38..355737d926 100644 --- a/asn1/cdt/packet-cdt-template.c +++ b/asn1/cdt/packet-cdt-template.c @@ -92,7 +92,7 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str (pinfo->cinfo, COL_PROTOCOL, "CDT"); col_clear (pinfo->cinfo, COL_INFO); - dissect_CompressedData_PDU (tvb, pinfo, tree); + dissect_CompressedData_PDU (tvb, pinfo, tree, NULL); } void proto_register_cdt (void) { diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 076535e23f..37fe3a5910 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -91,7 +91,7 @@ static const value_string cmip_error_code_vals[] = { # X.721 -#.REGISTER +#.REGISTER_NEW BaseManagedObjectId B "2.9.2.21.7.13" "BaseManagedObjectId(13)" # X.721 SimpleNameType B "2.9.3.2.7.1" "discriminatorId(1)" @@ -216,7 +216,7 @@ Priority RejectProblem -#.PDU +#.PDU_NEW #.FN_HDR CMIPAbortInfo diff --git a/asn1/cmp/cmp.cnf b/asn1/cmp/cmp.cnf index 3c9b7f804a..877f0d308f 100644 --- a/asn1/cmp/cmp.cnf +++ b/asn1/cmp/cmp.cnf @@ -50,7 +50,7 @@ RevDetails RevRepContent RevReqContent -#.REGISTER +#.REGISTER_NEW PBMParameter B "1.2.840.113533.7.66.13" "id-PasswordBasedMac" DHBMParameter B "1.2.640.113533.7.66.30" "id-DHBasedMac" CAProtEncCertValue B "1.3.6.1.5.5.7.4.1" "id-it-caProtEncCert" diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 6bbdf60e63..ece91a13a7 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -31,7 +31,7 @@ SignerInfos SignatureValue UnsignedAttributes -#.REGISTER +#.REGISTER_NEW ContentInfo B "1.2.840.113549.1.9.16.1.6" "id-ct-contentInfo" #OctetString B "1.2.840.113549.1.7.1" "id-data" see x509sat.cnf SignedData B "1.2.840.113549.1.7.2" "id-signedData" diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index b0afc8e898..7e3aba57a4 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -160,8 +160,8 @@ void proto_register_cms(void) { proto_register_field_array(proto_cms, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); - register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); + new_register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); + new_register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); register_ber_oid_syntax(".p7s", NULL, "ContentInfo"); register_ber_oid_syntax(".p7m", NULL, "ContentInfo"); register_ber_oid_syntax(".p7c", NULL, "ContentInfo"); diff --git a/asn1/credssp/credssp.cnf b/asn1/credssp/credssp.cnf index 6a2f301c04..5e943ac693 100644 --- a/asn1/credssp/credssp.cnf +++ b/asn1/credssp/credssp.cnf @@ -1,7 +1,7 @@ # credssp.cnf # Credential Security Support Provider (CredSSP) conformance file -#.PDU +#.PDU_NEW TSRequest #.FN_PARS TSRequest/authInfo VAL_PTR = &auth_tvb diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index 7649d8307a..63ed931ddb 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -63,8 +63,8 @@ static gint ett_credssp = -1; /* * Dissect CredSSP PDUs */ -static void -dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static int +dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -77,7 +77,7 @@ dissect_credssp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_clear(pinfo->cinfo, COL_INFO); creds_type = -1; - dissect_TSRequest_PDU(tvb, pinfo, tree); + return dissect_TSRequest_PDU(tvb, pinfo, tree, data); } static gboolean @@ -121,7 +121,7 @@ dissect_credssp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, tap_queue_packet(exported_pdu_tap, pinfo, exp_pdu_data); } - dissect_credssp(tvb, pinfo, parent_tree); + dissect_credssp(tvb, pinfo, parent_tree, NULL); return TRUE; } } @@ -162,7 +162,7 @@ void proto_register_credssp(void) { /* Register protocol */ proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME); - register_dissector("credssp", dissect_credssp, proto_credssp); + new_register_dissector("credssp", dissect_credssp, proto_credssp); /* Register fields and subtrees */ proto_register_field_array(proto_credssp, hf, array_length(hf)); diff --git a/asn1/crmf/crmf.cnf b/asn1/crmf/crmf.cnf index 42e6563f85..1919a543f7 100644 --- a/asn1/crmf/crmf.cnf +++ b/asn1/crmf/crmf.cnf @@ -42,7 +42,7 @@ SinglePubInfo SubsequentMessage UTF8Pairs -#.REGISTER +#.REGISTER_NEW EncKeyWithID B "1.2.840.113549.1.9.16.1.21" "id-ct-encKeyWithID" PBMParameter B "1.2.840.113533.7.66.13" "PasswordBasedMac" RegToken B "1.3.6.1.5.5.7.5.1.1" "id-regCtrl-regToken" diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index 407e678b02..f7f9c248d8 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -29,8 +29,7 @@ ModificationParameter/secondaryShadows modifiedSecondaryShadows CoordinateShadowUpdateArgumentData/updateStrategy/standard standardUpdate Information/signedInformation/information information-data -#.REGISTER - +#.REGISTER_NEW ShadowingAgreementInfo S dop.oid "agreement.2.5.19.1" EstablishParameter S dop.oid "establish.rolea.2.5.19.1" EstablishParameter S dop.oid "establish.roleb.2.5.19.1" diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index e6629be715..32f3ab7a98 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -71,7 +71,7 @@ TerminateOperationalBindingArgumentData/terminateAt terminateAtTime TerminateOperationalBindingResultData/terminateAt terminateAtGeneralizedTime -#.REGISTER +#.REGISTER_NEW DSEType B "2.5.12.0" "id-doa-dseType" SupplierInformation B "2.5.12.5" "id-doa-supplierKnowledge" ConsumerInformation B "2.5.12.6" "id-doa-consumerKnowledge" diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf index c10743b340..4d085856cc 100644 --- a/asn1/dsp/dsp.cnf +++ b/asn1/dsp/dsp.cnf @@ -43,11 +43,11 @@ MasterOrShadowAccessPoint/category access-point-category ChainingArguments/targetObject targetObjectDN -#.PDU +#.PDU_NEW AccessPoint MasterAndShadowAccessPoints -#.REGISTER +#.REGISTER_NEW AccessPoint B "2.5.12.1" "id-doa-myAccessPoint" AccessPoint B "2.5.12.2" "id-doa-superiorKnowledge" MasterAndShadowAccessPoints B "2.5.12.3" "id-doa-specificKnowledge" diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf index 85d040dad1..4073e8db60 100644 --- a/asn1/ess/ess.cnf +++ b/asn1/ess/ess.cnf @@ -8,9 +8,9 @@ #.EXPORTS ESSSecurityLabel_PDU -#.PDU +#.PDU_NEW -#.REGISTER +#.REGISTER_NEW ReceiptRequest B "1.2.840.113549.1.9.16.2.1" "id-aa-receiptRequest" ContentIdentifier B "1.2.840.113549.1.9.16.2.7" "id-aa-contentIdentifier" Receipt B "1.2.840.113549.1.9.16.1.1" "id-ct-receipt" diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index 5c1157f499..468fecd3d8 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -20,7 +20,7 @@ F-CHECK-response Other-Pattern #.END -#.PDU +#.PDU_NEW #.NO_EMIT ONLY_VALS PDU diff --git a/asn1/goose/goose.cnf b/asn1/goose/goose.cnf index 4640b1f584..d065e654c0 100644 --- a/asn1/goose/goose.cnf +++ b/asn1/goose/goose.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU +#.PDU_NEW #.NO_EMIT ONLY_VALS GOOSEpdu diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index d37dc59563..1c4cba9511 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -180,7 +180,7 @@ USSD-Res UU-Data VelocityEstimate #.END -#.REGISTER +#.REGISTER_NEW MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" # This table creates the value_sting to name GSM MAP operation codes and errors diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 77ccec4a1a..62a4c67667 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -20,7 +20,7 @@ MulticastAddress Capability #.END -#.PDU +#.PDU_NEW OpenLogicalChannel #.MAKE_ENUM diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 96035d73f9..01845a13c3 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -452,7 +452,7 @@ dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr upcoming_channel = NULL; codec_type = NULL; - dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree); + dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree, NULL); if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChn; diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index 5c1ade583b..81b50c8971 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU +#.PDU_NEW #.NO_EMIT MtpAddress diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf index aea26a198b..bce8da84db 100644 --- a/asn1/hnbap/hnbap.cnf +++ b/asn1/hnbap/hnbap.cnf @@ -7,7 +7,7 @@ PER ALIGNED #.END -#.PDU +#.PDU_NEW HNBAP-PDU ##.MAKE_DEFINES diff --git a/asn1/hnbap/packet-hnbap-template.c b/asn1/hnbap/packet-hnbap-template.c index ef90ecceb1..3b8b9b8d70 100644 --- a/asn1/hnbap/packet-hnbap-template.c +++ b/asn1/hnbap/packet-hnbap-template.c @@ -125,8 +125,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p return (dissector_try_uint_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; } -static void -dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *hnbap_item = NULL; proto_tree *hnbap_tree = NULL; @@ -138,7 +138,7 @@ dissect_hnbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hnbap_item = proto_tree_add_item(tree, proto_hnbap, tvb, 0, -1, ENC_NA); hnbap_tree = proto_item_add_subtree(hnbap_item, ett_hnbap); - dissect_HNBAP_PDU_PDU(tvb, pinfo, hnbap_tree); + return dissect_HNBAP_PDU_PDU(tvb, pinfo, hnbap_tree, data); } /*--- proto_register_hnbap -------------------------------------------*/ @@ -166,7 +166,7 @@ module_t *hnbap_module; proto_register_subtree_array(ett, array_length(ett)); /* Register dissector */ - register_dissector("hnbap", dissect_hnbap, proto_hnbap); + new_register_dissector("hnbap", dissect_hnbap, proto_hnbap); /* Register dissector tables */ hnbap_ies_dissector_table = register_dissector_table("hnbap.ies", "HNBAP-PROTOCOL-IES", FT_UINT32, BASE_DEC); diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf index f48ddae734..a9aa68cd3c 100644 --- a/asn1/inap/inap.cnf +++ b/asn1/inap/inap.cnf @@ -46,8 +46,6 @@ ERROR.&ParameterType OPERATION.&ArgumentType OPERATION.&ResultType -#.PDU - # This table creates the value_sting to name Inap operation codes and errors # in file packet-inap-table.c which is included in the template file # diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 4e4623badf..cca6a33848 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -31,7 +31,7 @@ LDAPOID TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL Mechanism TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL AssertionValue TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL -#.REGISTER +#.REGISTER_NEW SearchControlValue B "1.2.840.113556.1.4.319" "pagedResultsControl" SortKeyList B "1.2.840.113556.1.4.473" "sortKeyList" SortResult B "1.2.840.113556.1.4.474" "sortResult" diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 12fd428de0..044143418c 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -1950,6 +1950,15 @@ register_ldap_name_dissector(const char *attr_type_p, dissector_t dissector, int register_ldap_name_dissector_handle(attr_type_p, dissector_handle); } +void +new_register_ldap_name_dissector(const char *attr_type_p, new_dissector_t dissector, int proto) +{ + dissector_handle_t dissector_handle; + + dissector_handle=new_create_dissector_handle(dissector, proto); + register_ldap_name_dissector_handle(attr_type_p, dissector_handle); +} + /*--- proto_register_ldap -------------------------------------------*/ void proto_register_ldap(void) { diff --git a/asn1/ldap/packet-ldap-template.h b/asn1/ldap/packet-ldap-template.h index 390ad03ce0..ae72570376 100644 --- a/asn1/ldap/packet-ldap-template.h +++ b/asn1/ldap/packet-ldap-template.h @@ -101,6 +101,7 @@ typedef struct ldap_call_response { void register_ldap_name_dissector_handle(const char *attr_type, dissector_handle_t dissector); void register_ldap_name_dissector(const char *attr_type, dissector_t dissector, int proto); +void new_register_ldap_name_dissector(const char *attr_type, new_dissector_t dissector, int proto); WS_DLL_PUBLIC int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_); diff --git a/asn1/logotypecertextn/logotypecertextn.cnf b/asn1/logotypecertextn/logotypecertextn.cnf index d3c6906be9..c633cc0dea 100644 --- a/asn1/logotypecertextn/logotypecertextn.cnf +++ b/asn1/logotypecertextn/logotypecertextn.cnf @@ -5,9 +5,9 @@ #.EXPORTS -#.PDU +#.PDU_NEW -#.REGISTER +#.REGISTER_NEW LogotypeExtn B "1.3.6.1.5.5.7.1.12" "id-pe-logotype" LogotypeExtn B "1.3.6.1.5.5.7.20.1" "id-pe-logo-loyalty" LogotypeExtn B "1.3.6.1.5.5.7.20.2" "id-pe-logo-background" diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf index 387b9e5d8c..9e2d2fb641 100644 --- a/asn1/mms/mms.cnf +++ b/asn1/mms/mms.cnf @@ -9,7 +9,7 @@ ISO-8650-ACSE-1 acse #.EXPORTS MMSpdu -#.PDU +#.PDU_NEW #.NO_EMIT diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index cb023fbd09..f642be19e9 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -9,7 +9,7 @@ PER ALIGNED #.END -#.PDU +#.PDU_NEW NBAP-PDU #.MAKE_DEFINES diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index bd7a7bcf90..0571b75af8 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -447,8 +447,8 @@ static void nbap_init(void){ lchId_type_table[i+1] = *lch_contents[i]; } } -static void -dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *nbap_item = NULL; proto_tree *nbap_tree = NULL; @@ -465,7 +465,7 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nbap_hsdsch_channel_info[i].entity = hs; } - dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree); + return dissect_NBAP_PDU_PDU(tvb, pinfo, nbap_tree, data); } /*--- proto_register_nbap -------------------------------------------*/ @@ -518,7 +518,7 @@ void proto_register_nbap(void) expert_register_field_array(expert_nbap, ei, array_length(ei)); /* Register dissector */ - register_dissector("nbap", dissect_nbap, proto_nbap); + new_register_dissector("nbap", dissect_nbap, proto_nbap); nbap_module = prefs_register_protocol(proto_nbap, NULL); diff --git a/asn1/novell_pkis/novell_pkis.cnf b/asn1/novell_pkis/novell_pkis.cnf index 916fdb9350..6c5d22e36d 100644 --- a/asn1/novell_pkis/novell_pkis.cnf +++ b/asn1/novell_pkis/novell_pkis.cnf @@ -4,11 +4,12 @@ #.EXPORTS -#.REGISTER +#.REGISTER_NEW SecurityAttributes B "2.16.840.1.113719.1.9.4.1" "pa-sa" RelianceLimits B "2.16.840.1.113719.1.9.4.2" "pa-rl" -#.PDU +#.PDU_NEW + # PKIS-MESSAGE #.NO_EMIT diff --git a/asn1/ns_cert_exts/ns_cert_exts.cnf b/asn1/ns_cert_exts/ns_cert_exts.cnf index c8d8998bd9..9847554eba 100644 --- a/asn1/ns_cert_exts/ns_cert_exts.cnf +++ b/asn1/ns_cert_exts/ns_cert_exts.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.REGISTER +#.REGISTER_NEW CertType B "2.16.840.1.113730.1.1" "ns_cert_exts.cert_type" BaseUrl B "2.16.840.1.113730.1.2" "ns_cert_exts.base_url" RevocationUrl B "2.16.840.1.113730.1.3" "ns_cert_exts.revocation-url" diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf index 5b6831a298..757ac53645 100644 --- a/asn1/ocsp/ocsp.cnf +++ b/asn1/ocsp/ocsp.cnf @@ -18,9 +18,9 @@ PKIX1Explicit88 pkix1explicit #.EXPORTS OCSPResponse -#.PDU +#.PDU_NEW -#.REGISTER +#.REGISTER_NEW BasicOCSPResponse B "1.3.6.1.5.5.7.48.1.1" "id-pkix-ocsp-basic" ReOcspNonce B "1.3.6.1.5.5.7.48.1.2" "id-pkix-ocsp-nonce" CrlID B "1.3.6.1.5.5.7.48.1.3" "id-pkix-ocsp-crl" diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index a212e3ad74..ca30df147c 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -287,8 +287,6 @@ AsymmetricTokenData/name/recipient-name token-recipient-name TokenData/type token-data-type CertificateSelectors/content-integrity-check selectors-content-integrity-check -#.PDU - # This table creates the value_sting to name P3 operation codes and errors # in file packet-p3-table.c which is included in the template file # @@ -340,7 +338,7 @@ OPERATION.&ResultType #.END -#.REGISTER +#.REGISTER_NEW RecipientReassignmentProhibited N p1.extension 1 OriginatorRequestedAlternateRecipient N p1.extension 2 DLExpansionProhibited N p1.extension 3 diff --git a/asn1/p22/p22.cnf b/asn1/p22/p22.cnf index 4d51ee5d8b..d28550d708 100644 --- a/asn1/p22/p22.cnf +++ b/asn1/p22/p22.cnf @@ -81,7 +81,7 @@ ForwardedContentToken/_item/body-part-choice/message-or-content-body-part forwar ForwardedContentToken/_item/body-part-choice T_body_part_token_choice -#.REGISTER +#.REGISTER_NEW AbsenceAdvice B "2.6.1.19.0" "id-on-absence-advice" ChangeOfAddressAdvice B "2.6.1.19.1" "id-on-change-of-address-advice" IPMAssemblyInstructions B "2.6.1.17.2" "id-mst-assembly-instructions" diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index 46282deb0a..7f19b61c7d 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -206,7 +206,7 @@ OPERATION.&ArgumentType OPERATION.&ResultType #.END -#.REGISTER +#.REGISTER_NEW # MSGeneralAttributeTypes ReportLocation B "2.6.4.3.42" "id-att-ac-correlated-report-list" SequenceNumber B "2.6.4.3.76" "id-att-ac-report-subject-entry" diff --git a/asn1/p772/p772.cnf b/asn1/p772/p772.cnf index d2da78e3b6..05c544b838 100644 --- a/asn1/p772/p772.cnf +++ b/asn1/p772/p772.cnf @@ -40,7 +40,7 @@ AddressListDesignator/type address_list_type MessageType/type message_type_type OtherRecipientDesignator/type other_recipient_type -#.PDU +#.PDU_NEW PrimaryPrecedence CopyPrecedence MessageType @@ -59,7 +59,7 @@ OriginatorPlad Acp127NotificationType SecurityInformationLabels -#.REGISTER +#.REGISTER_NEW PrimaryPrecedence B "1.3.26.0.4406.0.2.0" "primary-precedence" CopyPrecedence B "1.3.26.0.4406.0.2.1" "copy-precedence" MessageType B "1.3.26.0.4406.0.2.2" "message-type" diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf index 5f000818a0..1a66217dec 100644 --- a/asn1/pkcs1/pkcs1.cnf +++ b/asn1/pkcs1/pkcs1.cnf @@ -15,7 +15,7 @@ DigestInfo #.FIELD_RENAME -#.REGISTER +#.REGISTER_NEW DSA-Params B "1.2.840.10040.4.1" "id-dsa" DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber" KEA-Params-Id B "2.16.840.1.101.2.1.1.22" "id-keyExchangeAlgorithm" diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index bdfe126978..db10a0e1bb 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -77,7 +77,7 @@ static gboolean try_null_password = FALSE; static void dissect_AuthenticatedSafe_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static void dissect_SafeContents_OCTETSTRING_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static void dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); +static int dissect_PrivateKeyInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data); #include "packet-pkcs12-hf.c" @@ -494,7 +494,7 @@ void proto_register_pkcs12(void) { "Whether to try and decrypt the encrypted data within the" " PKCS#12 with a NULL password", &try_null_password); - register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); + new_register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); register_ber_oid_syntax(".p12", NULL, "PKCS#12"); register_ber_oid_syntax(".pfx", NULL, "PKCS#12"); } diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index e8d008f998..17566a0d3c 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -11,7 +11,7 @@ PKCS-5 x509af #.EXPORTS -#.REGISTER +#.REGISTER_NEW KeyBag B "1.2.840.113549.1.12.10.1.1" "keyBag" PKCS8ShroudedKeyBag B "1.2.840.113549.1.12.10.1.2" "pkcs8ShroudedKeyBag" CertBag B "1.2.840.113549.1.12.10.1.3" "certBag" @@ -50,7 +50,7 @@ PBMAC1Params B "1.2.840.113549.1.5.14" "id-PBMAC1" PrivateKeyInfo/version privateKeyVersion PBKDF2Params/salt saltChoice -#.PDU +#.PDU_NEW AuthenticatedSafe PrivateKeyInfo @@ -145,7 +145,7 @@ PrivateKeyInfo - dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); + dissector_handle=new_create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); dissector_change_string("ber.oid", object_identifier_id, dissector_handle); PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf index a62ff8412f..f70c1dd33a 100644 --- a/asn1/pkinit/pkinit.cnf +++ b/asn1/pkinit/pkinit.cnf @@ -11,7 +11,7 @@ PKIX1Explicit88 pkix1explicit PaPkAsReq PaPkAsRep -#.REGISTER +#.REGISTER_NEW AuthPack B "1.3.6.1.5.2.3.1" "id-pkauthdata" KDCDHKeyInfo B "1.3.6.1.5.2.3.2" "id-pkdhkeydata" KRB5PrincipalName B "1.3.6.1.5.2.2" "id-pkinit-san" diff --git a/asn1/pkix1explicit/pkix1explicit.cnf b/asn1/pkix1explicit/pkix1explicit.cnf index 5d14dce5ea..13889ab14b 100644 --- a/asn1/pkix1explicit/pkix1explicit.cnf +++ b/asn1/pkix1explicit/pkix1explicit.cnf @@ -18,13 +18,13 @@ Version Time UniqueIdentifier -#.REGISTER +#.REGISTER_NEW DirectoryString B "1.3.6.1.5.5.7.2.1" "id-qt-cps" DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber" IPAddrBlocks B "1.3.6.1.5.5.7.1.7" "id-pe-ipAddrBlocks" ASIdentifiers B "1.3.6.1.5.5.7.1.8" "id-pe-autonomousSysIds" -#.PDU +#.PDU_NEW #.NO_EMIT diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf index 71ebc6c853..1c4723753f 100644 --- a/asn1/pkix1implicit/pkix1implicit.cnf +++ b/asn1/pkix1implicit/pkix1implicit.cnf @@ -17,9 +17,9 @@ AuthorityInfoAccessSyntax KeyIdentifier UserNotice -#.PDU +#.PDU_NEW -#.REGISTER +#.REGISTER_NEW AuthorityInfoAccessSyntax B "1.3.6.1.5.5.7.1.1" "id-pe-authorityInfoAccessSyntax" Dummy B "1.3.6.1.5.5.7.3.1" "id-kp-serverAuth" Dummy B "1.3.6.1.5.5.7.3.2" "id-kp-clientAuth" diff --git a/asn1/pkixac/pkixac.cnf b/asn1/pkixac/pkixac.cnf index ff0042cd44..95da0444c9 100644 --- a/asn1/pkixac/pkixac.cnf +++ b/asn1/pkixac/pkixac.cnf @@ -22,9 +22,7 @@ V2Form #.EXPORTS -#.PDU - -#.REGISTER +#.PDU_NEW #.NO_EMIT @@ -36,7 +34,7 @@ V2Form Clearance RFC3281Clearance -#.REGISTER +#.REGISTER_NEW AAControls B "1.3.6.1.5.5.7.1.6" "id-pe-aaControls" ProxyInfo B "1.3.6.1.5.5.7.1.10" "id-pe-ac-proxying" SvceAuthInfo B "1.3.6.1.5.5.7.10.1" "id-aca-authenticationInfo" diff --git a/asn1/pkixproxy/pkixproxy.cnf b/asn1/pkixproxy/pkixproxy.cnf index a80fbce56f..3fc770dac2 100644 --- a/asn1/pkixproxy/pkixproxy.cnf +++ b/asn1/pkixproxy/pkixproxy.cnf @@ -5,9 +5,9 @@ #.EXPORTS -#.PDU +#.PDU_NEW -#.REGISTER +#.REGISTER_NEW ProxyCertInfoExtension B "1.3.6.1.5.5.7.1.14" "id-pe-proxyCertInfo" #.NO_EMIT diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf index 0e3315efc6..cdb6a8e4b1 100644 --- a/asn1/pkixqualified/pkixqualified.cnf +++ b/asn1/pkixqualified/pkixqualified.cnf @@ -7,7 +7,7 @@ #.EXPORTS -#.REGISTER +#.REGISTER_NEW BiometricSyntax B "1.3.6.1.5.5.7.1.2" "id-pe-biometricInfo" QCStatements B "1.3.6.1.5.5.7.1.3" "id-pe-qcStatements" SemanticsInformation B "1.3.6.1.5.5.7.11.1" "id-qcs-pkixQCSyntax-v1" diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf index d377d5bcac..3e44e65708 100644 --- a/asn1/pkixtsp/pkixtsp.cnf +++ b/asn1/pkixtsp/pkixtsp.cnf @@ -11,9 +11,7 @@ PKIX1Implicit88 pkix1implicit #.EXPORTS -#.PDU - -#.REGISTER +#.PDU_NEW #.NO_EMIT @@ -24,7 +22,7 @@ TSTInfo/version Tst_version PKIStatusInfo/status pki_status TSTInfo/version tst_version -#.REGISTER +#.REGISTER_NEW TSTInfo B "1.2.840.113549.1.9.16.1.4" "id-ct-TSTInfo" #.END diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index b7b090b235..e3a485eacb 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -333,7 +333,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d } /* dissect the packet */ - dissect_UD_type_PDU(tvb, pinfo, clpres_tree); + dissect_UD_type_PDU(tvb, pinfo, clpres_tree, NULL); return tvb_captured_length(tvb); } diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index f0f3cac3fa..f7129a8edf 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU +#.PDU_NEW UD-type #.NO_EMIT diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index e1cf733d6d..5dbf523f72 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -163,13 +163,13 @@ dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr case BER_CLASS_CON: switch (tag) { case 10 : /* Network Facility Extension */ - dissect_NetworkFacilityExtension_PDU(next_tvb, pinfo, tree); + dissect_NetworkFacilityExtension_PDU(next_tvb, pinfo, tree, NULL); break; case 18 : /* Network Protocol Profile */ - dissect_NetworkProtocolProfile_PDU(next_tvb, pinfo, tree); + dissect_NetworkProtocolProfile_PDU(next_tvb, pinfo, tree, NULL); break; case 11 : /* Interpretation Component */ - dissect_InterpretationComponent_PDU(next_tvb, pinfo, tree); + dissect_InterpretationComponent_PDU(next_tvb, pinfo, tree, NULL); break; /* ROSE APDU */ case 1 : /* invoke */ diff --git a/asn1/q932/q932.cnf b/asn1/q932/q932.cnf index e5bcf3b968..e43e1a7aae 100644 --- a/asn1/q932/q932.cnf +++ b/asn1/q932/q932.cnf @@ -2,7 +2,7 @@ # Q.932 conformation file # 2007 Tomas Kukosa -#.PDU +#.PDU_NEW InterpretationComponent NetworkFacilityExtension diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index de6842e655..867431b3c8 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -122,8 +122,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p return (dissector_try_string(rnsap_proc_uout_dissector_table, ProcedureID, tvb, pinfo, tree, NULL)) ? tvb_captured_length(tvb) : 0; } -static void -dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *rnsap_item = NULL; proto_tree *rnsap_tree = NULL; @@ -135,7 +135,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA); rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap); - dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree); + return dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree, data); } /*--- proto_register_rnsap -------------------------------------------*/ @@ -161,7 +161,7 @@ void proto_register_rnsap(void) { proto_register_subtree_array(ett, array_length(ett)); /* Register dissector */ - register_dissector("rnsap", dissect_rnsap, proto_rnsap); + new_register_dissector("rnsap", dissect_rnsap, proto_rnsap); /* Register dissector tables */ rnsap_ies_dissector_table = register_dissector_table("rnsap.ies", "RNSAP-PROTOCOL-IES", FT_UINT32, BASE_DEC); diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf index 25f7198d45..fd6e9539d5 100644 --- a/asn1/rnsap/rnsap.cnf +++ b/asn1/rnsap/rnsap.cnf @@ -11,7 +11,7 @@ ALIGNED EDPCH-Information-RLReconfPrepare-FDD Non-Serving-RL-Preconfig-Info -#.PDU +#.PDU_NEW RNSAP-PDU #.MAKE_DEFINES diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c index 96a05320b5..3e48e256ff 100644 --- a/asn1/rrlp/packet-rrlp-template.c +++ b/asn1/rrlp/packet-rrlp-template.c @@ -83,7 +83,7 @@ void proto_register_rrlp(void) { /* Register protocol */ proto_rrlp = proto_register_protocol(PNAME, PSNAME, PFNAME); - register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp); + new_register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp); /* Register fields and subtrees */ proto_register_field_array(proto_rrlp, hf, array_length(hf)); diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index 7a44431a8b..31774b19f9 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -7,7 +7,7 @@ PER UNALIGNED #.END -#.PDU +#.PDU_NEW PDU #.OMIT_ASSIGNMENTS_EXCEPT MAP-LCS-DataTypes diff --git a/asn1/rua/packet-rua-template.c b/asn1/rua/packet-rua-template.c index 37947b187f..7d9cef906e 100644 --- a/asn1/rua/packet-rua-template.c +++ b/asn1/rua/packet-rua-template.c @@ -110,8 +110,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p return (dissector_try_uint_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; } -static void -dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *rua_item = NULL; proto_tree *rua_tree = NULL; @@ -123,7 +123,7 @@ dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rua_item = proto_tree_add_item(tree, proto_rua, tvb, 0, -1, ENC_NA); rua_tree = proto_item_add_subtree(rua_item, ett_rua); - dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree); + return dissect_RUA_PDU_PDU(tvb, pinfo, rua_tree, data); } /*--- proto_register_rua -------------------------------------------*/ @@ -151,7 +151,7 @@ module_t *rua_module; proto_register_subtree_array(ett, array_length(ett)); /* Register dissector */ - register_dissector("rua", dissect_rua, proto_rua); + new_register_dissector("rua", dissect_rua, proto_rua); /* Register dissector tables */ rua_ies_dissector_table = register_dissector_table("rua.ies", "RUA-PROTOCOL-IES", FT_UINT32, BASE_DEC); diff --git a/asn1/rua/rua.cnf b/asn1/rua/rua.cnf index 90cd62a099..96948c77b6 100644 --- a/asn1/rua/rua.cnf +++ b/asn1/rua/rua.cnf @@ -7,7 +7,7 @@ PER ALIGNED #.END -#.PDU +#.PDU_NEW RUA-PDU #.MAKE_ENUM diff --git a/asn1/smrse/smrse.cnf b/asn1/smrse/smrse.cnf index 7aec8fd20e..23ef7d36a1 100644 --- a/asn1/smrse/smrse.cnf +++ b/asn1/smrse/smrse.cnf @@ -9,7 +9,7 @@ SemiOctetString #.END -#.PDU +#.PDU_NEW #.TYPE_RENAME diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 00616df375..b4277e2cbe 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -2137,8 +2137,8 @@ dissect_snmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static void -dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_tree *smux_tree = NULL; proto_item *item = NULL; @@ -2147,12 +2147,10 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); - if (tree) { - item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_NA); - smux_tree = proto_item_add_subtree(item, ett_smux); - } + item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, ENC_NA); + smux_tree = proto_item_add_subtree(item, ett_smux); - dissect_SMUX_PDUs_PDU(tvb, pinfo, smux_tree); + return dissect_SMUX_PDUs_PDU(tvb, pinfo, smux_tree, data); } @@ -2638,7 +2636,7 @@ proto_reg_handoff_smux(void) { dissector_handle_t smux_handle; - smux_handle = create_dissector_handle(dissect_smux, proto_smux); + smux_handle = new_create_dissector_handle(dissect_smux, proto_smux); dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle); } diff --git a/asn1/snmp/snmp.cnf b/asn1/snmp/snmp.cnf index 5e899abd29..22e1ac3150 100644 --- a/asn1/snmp/snmp.cnf +++ b/asn1/snmp/snmp.cnf @@ -2,7 +2,7 @@ # snmp conformation file -#.PDU +#.PDU_NEW SMUX-PDUs #.NO_EMIT diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index 2eaec5b0d5..e9f5251db2 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -3,7 +3,7 @@ #.EXPORTS -#.PDU +#.PDU_NEW #.NO_EMIT ONLY_VALS NegotiationToken diff --git a/asn1/sv/sv.cnf b/asn1/sv/sv.cnf index e261d3cdf3..0b04cabd8c 100644 --- a/asn1/sv/sv.cnf +++ b/asn1/sv/sv.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.PDU +#.PDU_NEW #.NO_EMIT ONLY_VALS SampledValues diff --git a/asn1/t124/t124.cnf b/asn1/t124/t124.cnf index 69238eeb74..0a4faea114 100644 --- a/asn1/t124/t124.cnf +++ b/asn1/t124/t124.cnf @@ -89,7 +89,7 @@ PSDNConnection ATMConnection ExtendedE164NetworkAddress TransportAddress -#.PDU + #---------------------------------------------------------------------------------------- #.PDU_NEW diff --git a/asn1/t125/t125.cnf b/asn1/t125/t125.cnf index ab058dd549..57116ad6fe 100644 --- a/asn1/t125/t125.cnf +++ b/asn1/t125/t125.cnf @@ -64,7 +64,7 @@ AssignedChannelId TokenId DynamicChannelId ChannelId -#.PDU + #---------------------------------------------------------------------------------------- #.PDU_NEW diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index 5df3b0dbf0..30a491e531 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -14,11 +14,11 @@ Release-response-reason DialoguePDU UniDialoguePDU -#.REGISTER +#.REGISTER_NEW DialoguePDU B "0.0.17.773.1.1.1" "id-as-dialogue" UniDialoguePDU B "0.0.17.773.1.2.1" "id-as-uniDialogue" -#.PDU +#.PDU_NEW #.NO_EMIT ONLY_VALS diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c index 1429b1a995..bea66a601d 100644 --- a/asn1/tetra/packet-tetra-template.c +++ b/asn1/tetra/packet-tetra-template.c @@ -233,29 +233,29 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre switch(channel_type) { case TETRA_CHAN_AACH: - dissect_AACH_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_AACH_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case TETRA_CHAN_SCH_F: p = tvb_get_guint8(pdu, 0); switch(p >> 6) { case 0: if (dir == TETRA_DOWNLINK) - dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_DATA_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_DATA_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-FRAG or MAC-END */ if((p >> 5) == 3) { if (dir == TETRA_DOWNLINK) - dissect_MAC_END_DOWNLINK_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_END_DOWNLINK_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_END_UPLINK_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_END_UPLINK_PDU(pdu, pinfo, tetra_sub_tree, NULL); } else - dissect_MAC_FRAG_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_FRAG_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 2: - dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; @@ -263,16 +263,16 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre p = tvb_get_guint8(pdu, 0); switch(p >> 6) { case 0: - dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-FRAG or MAC-END */ if((p >> 5) == 3) - dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 2: - dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; @@ -280,38 +280,38 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre p = tvb_get_guint8(pdu, 0); switch(p >> 7) { case 0: /* MAC-ACCESS */ - dissect_MAC_ACCESS_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_ACCESS_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-END-HU */ - dissect_MAC_END_HU_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_END_HU_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; case TETRA_CHAN_BSCH: col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "BSCH"); - dissect_BSCH_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_BSCH_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case TETRA_CHAN_BNCH: col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "BNCH"); - dissect_BNCH_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_BNCH_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case TETRA_CHAN_STCH: p = tvb_get_guint8(pdu, 0); switch(p >> 6) { case 0: - dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_RESOURCE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 1: /* MAC-FRAG or MAC-END */ if((p >> 5) == 3) { if (dir == TETRA_DOWNLINK) - dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_END_DOWN111_PDU(pdu, pinfo, tetra_sub_tree, NULL); else - dissect_MAC_END_UP114_PDU(pdu, pinfo, tetra_sub_tree); + dissect_MAC_END_UP114_PDU(pdu, pinfo, tetra_sub_tree, NULL); } else - dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_FRAG120_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; case 2: - dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree ); + dissect_MAC_ACCESS_DEFINE_PDU(pdu, pinfo, tetra_sub_tree, NULL); break; } break; diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf index 8c4aab8a48..c7b5cee4cd 100644 --- a/asn1/tetra/tetra.cnf +++ b/asn1/tetra/tetra.cnf @@ -54,7 +54,7 @@ CALLMODE #.END -#.PDU +#.PDU_NEW AACH MAC-FRAG MAC-FRAG120 diff --git a/asn1/wlancertextn/wlancertextn.cnf b/asn1/wlancertextn/wlancertextn.cnf index 2a86702974..5187d2b029 100644 --- a/asn1/wlancertextn/wlancertextn.cnf +++ b/asn1/wlancertextn/wlancertextn.cnf @@ -5,7 +5,7 @@ #.EXPORTS -#.REGISTER +#.REGISTER_NEW SSIDList B "1.3.6.1.5.5.7.1.13" "id-pe-wlanSSID" SSIDList B "1.3.6.1.5.5.7.10.6" "id-aca-wlanSSID" diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index 1491eacef5..d6d422d93c 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -112,8 +112,8 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p return (dissector_try_uint(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_captured_length(tvb) : 0; } -static void -dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *x2ap_item = NULL; proto_tree *x2ap_tree = NULL; @@ -125,7 +125,7 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, ENC_NA); x2ap_tree = proto_item_add_subtree(x2ap_item, ett_x2ap); - dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree); + return dissect_X2AP_PDU_PDU(tvb, pinfo, x2ap_tree, data); } /*--- proto_register_x2ap -------------------------------------------*/ @@ -162,7 +162,7 @@ void proto_register_x2ap(void) { proto_register_subtree_array(ett, array_length(ett)); /* Register dissector */ - register_dissector("x2ap", dissect_x2ap, proto_x2ap); + new_register_dissector("x2ap", dissect_x2ap, proto_x2ap); /* Register dissector tables */ x2ap_ies_dissector_table = register_dissector_table("x2ap.ies", "X2AP-PROTOCOL-IES", FT_UINT32, BASE_DEC); diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf index c8cbb7ebed..50ba8cfe8e 100644 --- a/asn1/x2ap/x2ap.cnf +++ b/asn1/x2ap/x2ap.cnf @@ -11,7 +11,7 @@ ALIGNED # Get rid of unused code warnings #.END -#.PDU +#.PDU_NEW X2AP-PDU #.MAKE_ENUM diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index bad4dee392..561176071b 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -106,9 +106,9 @@ void proto_register_x509af(void) { proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); - register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); - register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); + new_register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); + new_register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); + new_register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); register_ber_oid_syntax(".cer", NULL, "Certificate"); register_ber_oid_syntax(".crt", NULL, "Certificate"); @@ -156,15 +156,15 @@ void proto_reg_handoff_x509af(void) { /* these will generally be encoded as ";binary" in LDAP */ - register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af); - register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af); + new_register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af); + new_register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af); - register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af); - register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af); + new_register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af); + new_register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af); - register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af); - register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af); + new_register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af); + new_register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af); - register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af); + new_register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af); } diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index 0a86365714..5752bfb518 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -31,9 +31,9 @@ Time Validity Version -#.PDU +#.PDU_NEW -#.REGISTER +#.REGISTER_NEW Certificate B "2.5.4.36" "id-at-userCertificate" Certificate B "2.5.4.37" "id-at-cAcertificate" CertificateList B "2.5.4.38" "id-at-authorityRevocationList" diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index 58b15602a8..da8524621c 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -62,11 +62,11 @@ x509ce_enable_ciplus(void) { dissector_handle_t dh25, dh26, dh27; - dh25 = create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce); + dh25 = new_create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce); dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.25", dh25); - dh26 = create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce); + dh26 = new_create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce); dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.26", dh26); - dh27 = create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce); + dh27 = new_create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce); dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.27", dh27); } diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 454ea8958e..96962fb58f 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -89,13 +89,13 @@ ScramblerCapabilities CiplusInfo CicamBrandId -#.PDU +#.PDU_NEW ScramblerCapabilities CiplusInfo CicamBrandId -#.REGISTER +#.REGISTER_NEW CertificatePoliciesSyntax B "2.5.29.3" "id-ce-certificatePolicies" AttributesSyntax B "2.5.29.9" "id-ce-subjectDirectoryAttributes" SubjectKeyIdentifier B "2.5.29.14" "id-ce-subjectKeyIdentifier" diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index d54bdaf295..86d620e26d 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -98,7 +98,7 @@ SearchRuleDescription SearchRuleId SubtreeSpecification -#.PDU +#.PDU_NEW DistinguishedName #.NO_EMIT @@ -136,7 +136,7 @@ RequestAttribute/defaultValues/_item/values/_item ra_values_item RequestAttribute/selectedValues ra_selectedValues RequestAttribute/selectedValues/_item ra_selectedValues_item -#.REGISTER +#.REGISTER_NEW DistinguishedName B "2.5.4.1" "id-at-aliasedEntryName" DistinguishedName B "2.5.4.31" "id-at-member" DistinguishedName B "2.5.4.32" "id-at-owner" diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 6ea1bf9148..ada404afd3 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -101,7 +101,7 @@ TelexNumber UniqueIdentifier X121Address -#.REGISTER +#.REGISTER_NEW ObjectIdentifier B "2.5.4.0" "id-at-objectClass" # - see x509if.cnf for "id-at-aliasedEntryName" DirectoryString B "2.5.4.2" "id-at-knowledgeInformation" |