From cefda4dc7b2ec4b955b7d5b6ddc2f913e684695c Mon Sep 17 00:00:00 2001 From: kukosa Date: Wed, 28 Jun 2006 14:19:08 +0000 Subject: [PATCH] remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related use add_oid_str_name() and get_oid_str_name() instead of them git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18595 f5534014-38df-0310-8fa8-9805f1628bb7 --- asn1/acp133/packet-acp133-template.c | 91 +++--- asn1/acse/packet-acse-template.c | 3 +- asn1/camel/packet-camel-template.c | 3 +- asn1/cdt/cdt.cnf | 2 +- asn1/cmip/packet-cmip-template.c | 5 +- asn1/cms/cms.cnf | 2 +- asn1/dap/packet-dap-template.c | 3 +- asn1/disp/packet-disp-template.c | 11 +- asn1/dop/dop.cnf | 2 +- asn1/dop/packet-dop-template.c | 35 +-- asn1/dsp/packet-dsp-template.c | 3 +- asn1/ftam/packet-ftam-template.c | 25 +- asn1/gsmmap/packet-gsm_map-template.c | 7 +- asn1/ldap/packet-ldap-template.c | 40 +-- asn1/pkixproxy/packet-pkixproxy-template.c | 7 +- asn1/tcap/packet-tcap-template.c | 3 +- .../packet-wlancertextn-template.c | 5 +- asn1/x411/packet-x411-template.c | 5 +- asn1/x411/x411.cnf | 4 +- asn1/x420/x420.cnf | 2 +- asn1/x509af/x509af.cnf | 4 +- asn1/x509if/x509if.cnf | 4 +- asn1/x509sat/packet-x509sat-template.c | 53 ++-- epan/dissectors/packet-acp133.c | 103 +++---- epan/dissectors/packet-acse.c | 13 +- epan/dissectors/packet-ber.c | 17 +- epan/dissectors/packet-ber.h | 2 - epan/dissectors/packet-camel.c | 259 +++++++++--------- epan/dissectors/packet-cdt.c | 2 +- epan/dissectors/packet-cmip.c | 15 +- epan/dissectors/packet-cms.c | 14 +- epan/dissectors/packet-dap.c | 61 +++-- epan/dissectors/packet-disp.c | 63 ++--- epan/dissectors/packet-dop.c | 49 ++-- epan/dissectors/packet-dsp.c | 15 +- epan/dissectors/packet-ftam.c | 79 +++--- epan/dissectors/packet-gsm_map.c | 17 +- epan/dissectors/packet-ldap.c | 80 +++--- epan/dissectors/packet-ldap.h | 2 +- epan/dissectors/packet-per.h | 2 +- epan/dissectors/packet-pkixproxy.c | 19 +- epan/dissectors/packet-tcap.c | 13 +- epan/dissectors/packet-wlancertextn.c | 17 +- epan/dissectors/packet-x411.c | 71 ++--- epan/dissectors/packet-x420.c | 46 ++-- epan/dissectors/packet-x509af.c | 4 +- epan/dissectors/packet-x509if.c | 14 +- epan/dissectors/packet-x509sat.c | 65 ++--- 48 files changed, 687 insertions(+), 674 deletions(-) diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c index c3d47d6dfe..241c5877c9 100644 --- a/asn1/acp133/packet-acp133-template.c +++ b/asn1/acp133/packet-acp133-template.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -91,56 +92,56 @@ void proto_reg_handoff_acp133(void) { #include "packet-acp133-dis-tab.c" /* X.402 Object Classes */ - register_ber_oid_name("2.6.5.1.0","id-oc-mhs-distribution-list"); - register_ber_oid_name("2.6.5.1.1","id-oc-mhs-message-store"); - register_ber_oid_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent"); - register_ber_oid_name("2.6.5.1.3","id-oc-mhs-user"); + add_oid_str_name("2.6.5.1.0","id-oc-mhs-distribution-list"); + add_oid_str_name("2.6.5.1.1","id-oc-mhs-message-store"); + add_oid_str_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent"); + add_oid_str_name("2.6.5.1.3","id-oc-mhs-user"); /* SDN.701 Object Classes */ - register_ber_oid_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user"); - register_ber_oid_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms"); + add_oid_str_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user"); + add_oid_str_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms"); /* ACP133 Object Classes */ - register_ber_oid_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData"); - register_ber_oid_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator"); - register_ber_oid_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName"); - register_ber_oid_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit"); - register_ber_oid_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled"); - register_ber_oid_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription"); - register_ber_oid_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser"); - register_ber_oid_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList"); - register_ber_oid_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway"); - register_ber_oid_name("2.16.840.1.101.2.2.3.60", "id-oc-network"); - register_ber_oid_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions"); - register_ber_oid_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation"); - register_ber_oid_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson"); - register_ber_oid_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent"); - register_ber_oid_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser"); - register_ber_oid_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB"); - register_ber_oid_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB"); + add_oid_str_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData"); + add_oid_str_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator"); + add_oid_str_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName"); + add_oid_str_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit"); + add_oid_str_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled"); + add_oid_str_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription"); + add_oid_str_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser"); + add_oid_str_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList"); + add_oid_str_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway"); + add_oid_str_name("2.16.840.1.101.2.2.3.60", "id-oc-network"); + add_oid_str_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions"); + add_oid_str_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation"); + add_oid_str_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson"); + add_oid_str_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent"); + add_oid_str_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA"); + add_oid_str_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser"); + add_oid_str_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB"); + add_oid_str_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB"); /* gateway types */ - register_ber_oid_name("2.16.840.1.101.2.2.5.0", "acp120-acp127"); - register_ber_oid_name("2.16.840.1.101.2.2.5.1", "acp120-janap128"); - register_ber_oid_name("2.16.840.1.101.2.2.5.2", "acp120-mhs"); - register_ber_oid_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs"); - register_ber_oid_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822"); - register_ber_oid_name("2.16.840.1.101.2.2.5.5", "boundaryMTA"); - register_ber_oid_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs"); - register_ber_oid_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822"); - register_ber_oid_name("2.16.840.1.101.2.2.5.8", "mta-acp127"); + add_oid_str_name("2.16.840.1.101.2.2.5.0", "acp120-acp127"); + add_oid_str_name("2.16.840.1.101.2.2.5.1", "acp120-janap128"); + add_oid_str_name("2.16.840.1.101.2.2.5.2", "acp120-mhs"); + add_oid_str_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs"); + add_oid_str_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822"); + add_oid_str_name("2.16.840.1.101.2.2.5.5", "boundaryMTA"); + add_oid_str_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs"); + add_oid_str_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822"); + add_oid_str_name("2.16.840.1.101.2.2.5.8", "mta-acp127"); } diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index cea1aeb173..f756ba2208 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -268,7 +269,7 @@ void proto_register_acse(void) { void proto_reg_handoff_acse(void) { /*#include "packet-acse-dis-tab.c"*/ - register_ber_oid_name("2.2.3.1.1","aCSE-id"); + add_oid_str_name("2.2.3.1.1","aCSE-id"); register_ber_oid_dissector(ACSE_APDU_OID, dissect_acse, proto_acse, "acse-as-id"); diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 7a3c5e3fbc..1649967848 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -760,7 +761,7 @@ void proto_register_camel(void) { register_ber_oid_dissector_handle("0.4.0.0.1.0.52.1",camel_handle, proto_camel, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network|umts-Network(1) applicationContext(0) cap-gsmSRF-to-gsmscf(52) version2(1)" ); register_ber_oid_dissector_handle("0.4.0.0.1.21.3.50",camel_handle, proto_camel, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) cAP3OE(21) ac(3) id-ac-CAP-gprsSSF-gsmSCF-AC(50)" ); - register_ber_oid_name("0.4.0.0.1.1.5.2","iitu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) cap-GPRS-ReferenceNumber(5) version3(2)"); + add_oid_str_name("0.4.0.0.1.1.5.2","iitu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) cap-GPRS-ReferenceNumber(5) version3(2)"); diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf index e7e1ee8ae1..13a1a2711d 100644 --- a/asn1/cdt/cdt.cnf +++ b/asn1/cdt/cdt.cnf @@ -49,7 +49,7 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" %(DEFAULT_BODY)s if (obj_id) { - const char *name = get_ber_oid_name (obj_id); + const char *name = get_oid_str_name (obj_id); if (!name) { name = obj_id; diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index a69354ea76..cd85d95891 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -256,8 +257,8 @@ void proto_reg_handoff_cmip(void) { register_ber_oid_dissector("2.9.3.2.7.63", dissect_cmip_attribute_63, proto_cmip, "smi2AttributeID (7) nameBinding(63)"); register_ber_oid_dissector("2.9.3.2.7.65", dissect_cmip_attribute_65, proto_cmip, "smi2AttributeID (7) objectClass(65)"); - register_ber_oid_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)"); - register_ber_oid_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); + add_oid_str_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)"); + add_oid_str_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); } diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index bfb002e3dc..04d2d72217 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -96,7 +96,7 @@ EncryptedContentInfo/contentType encryptedContentType %(DEFAULT_BODY)s if(object_identifier_id) { - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id); } diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c index d2fb2049f0..4bc4a31d3b 100644 --- a/asn1/dap/packet-dap-template.c +++ b/asn1/dap/packet-dap-template.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -316,7 +317,7 @@ void proto_reg_handoff_dap(void) { /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.1", "id-ac-directory-access"); + add_oid_str_name("2.5.3.1", "id-ac-directory-access"); /* ABSTRACT SYNTAXES */ diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index ab4a1055e8..73383f36c4 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -243,10 +244,10 @@ void proto_reg_handoff_disp(void) { /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.4", "id-ac-shadow-consumer-initiated"); - register_ber_oid_name("2.5.3.5", "id-ac-shadow-supplier-initiated"); - register_ber_oid_name("2.5.3.6", "id-ac-reliable-shadow-consumer-initiated"); - register_ber_oid_name("2.5.3.7", "id-ac-reliable-shadow-supplier-initiated"); + add_oid_str_name("2.5.3.4", "id-ac-shadow-consumer-initiated"); + add_oid_str_name("2.5.3.5", "id-ac-shadow-supplier-initiated"); + add_oid_str_name("2.5.3.6", "id-ac-reliable-shadow-consumer-initiated"); + add_oid_str_name("2.5.3.7", "id-ac-reliable-shadow-supplier-initiated"); /* ABSTRACT SYNTAXES */ @@ -259,7 +260,7 @@ void proto_reg_handoff_disp(void) { } /* OPERATIONAL BINDING */ - register_ber_oid_name("2.5.1.0.5.1", "id-op-binding-shadow"); + add_oid_str_name("2.5.1.0.5.1", "id-op-binding-shadow"); tpkt_handle = find_dissector("tpkt"); diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index 11b3e96ce8..19f10a0784 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -96,7 +96,7 @@ ACIItem B "2.5.24.6" "id-aca-subentryACI" %(DEFAULT_BODY)s if(check_col(pinfo->cinfo, COL_INFO)) { - name = get_ber_oid_name(binding_type); + name = get_oid_str_name(binding_type); col_append_fstr(pinfo->cinfo, COL_INFO, " %%s", name ? name : binding_type); } diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 72a9b11768..801ee49a39 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -259,7 +260,7 @@ void proto_reg_handoff_dop(void) { #include "packet-dop-dis-tab.c" /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.3", "id-ac-directory-operational-binding-management"); + add_oid_str_name("2.5.3.3", "id-ac-directory-operational-binding-management"); /* ABSTRACT SYNTAXES */ @@ -270,26 +271,26 @@ void proto_reg_handoff_dop(void) { /* BINDING TYPES */ - register_ber_oid_name("2.5.19.1", "shadow-agreement"); - register_ber_oid_name("2.5.19.2", "hierarchical-agreement"); - register_ber_oid_name("2.5.19.3", "non-specific-hierarchical-agreement"); + add_oid_str_name("2.5.19.1", "shadow-agreement"); + add_oid_str_name("2.5.19.2", "hierarchical-agreement"); + add_oid_str_name("2.5.19.3", "non-specific-hierarchical-agreement"); /* ACCESS CONTROL SCHEMES */ - register_ber_oid_name("2.5.28.1", "basic-ACS"); - register_ber_oid_name("2.5.28.2", "simplified-ACS"); - register_ber_oid_name("2.5.28.3", "ruleBased-ACS"); - register_ber_oid_name("2.5.28.4", "ruleAndBasic-ACS"); - register_ber_oid_name("2.5.28.5", "ruleAndSimple-ACS"); + add_oid_str_name("2.5.28.1", "basic-ACS"); + add_oid_str_name("2.5.28.2", "simplified-ACS"); + add_oid_str_name("2.5.28.3", "ruleBased-ACS"); + add_oid_str_name("2.5.28.4", "ruleAndBasic-ACS"); + add_oid_str_name("2.5.28.5", "ruleAndSimple-ACS"); /* ADMINISTRATIVE ROLES */ - register_ber_oid_name("2.5.23.1", "id-ar-autonomousArea"); - register_ber_oid_name("2.5.23.2", "id-ar-accessControlSpecificArea"); - register_ber_oid_name("2.5.23.3", "id-ar-accessControlInnerArea"); - register_ber_oid_name("2.5.23.4", "id-ar-subschemaAdminSpecificArea"); - register_ber_oid_name("2.5.23.5", "id-ar-collectiveAttributeSpecificArea"); - register_ber_oid_name("2.5.23.6", "id-ar-collectiveAttributeInnerArea"); - register_ber_oid_name("2.5.23.7", "id-ar-contextDefaultSpecificArea"); - register_ber_oid_name("2.5.23.8", "id-ar-serviceSpecificArea"); + add_oid_str_name("2.5.23.1", "id-ar-autonomousArea"); + add_oid_str_name("2.5.23.2", "id-ar-accessControlSpecificArea"); + add_oid_str_name("2.5.23.3", "id-ar-accessControlInnerArea"); + add_oid_str_name("2.5.23.4", "id-ar-subschemaAdminSpecificArea"); + add_oid_str_name("2.5.23.5", "id-ar-collectiveAttributeSpecificArea"); + add_oid_str_name("2.5.23.6", "id-ar-collectiveAttributeInnerArea"); + add_oid_str_name("2.5.23.7", "id-ar-contextDefaultSpecificArea"); + add_oid_str_name("2.5.23.8", "id-ar-serviceSpecificArea"); /* remember the tpkt handler for change in preferences */ tpkt_handle = find_dissector("tpkt"); diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index 085b24331b..fb449d735c 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -321,7 +322,7 @@ void proto_reg_handoff_dsp(void) { /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.2", "id-ac-directory-system"); + add_oid_str_name("2.5.3.2", "id-ac-directory-system"); /* ABSTRACT SYNTAXES */ diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 66d33238ef..5a5fe32280 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -126,22 +127,22 @@ void proto_reg_handoff_ftam(void) { 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_name("1.0.8571.5.1","ISO FTAM unstructured text"); - register_ber_oid_name("1.0.8571.5.2","ISO FTAM sequential text"); - register_ber_oid_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); - register_ber_oid_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); - register_ber_oid_name("1.0.8571.2.5","FTAM simple-hierarchy"); - register_ber_oid_name("1.0.8571.3.1","FTAM hierarchical file model"); - register_ber_oid_name("1.0.8571.4.1","FTAM unstructured constraint set"); + add_oid_str_name("1.0.8571.5.1","ISO FTAM unstructured text"); + add_oid_str_name("1.0.8571.5.2","ISO FTAM sequential text"); + add_oid_str_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); + add_oid_str_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); + add_oid_str_name("1.0.8571.2.5","FTAM simple-hierarchy"); + add_oid_str_name("1.0.8571.3.1","FTAM hierarchical file model"); + add_oid_str_name("1.0.8571.4.1","FTAM unstructured constraint set"); /* Unstructured text file document type FTAM-3 */ - register_ber_oid_name("1.0.8571.5.3","ISO FTAM unstructured binary"); - register_ber_oid_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); + add_oid_str_name("1.0.8571.5.3","ISO FTAM unstructured binary"); + add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); /* Filedirectory file document type NBS-9 */ - register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); + add_oid_str_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); /* Filedirectory file document type NBS-9 (WITH OLD NIST OIDs)*/ - register_ber_oid_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file"); - register_ber_oid_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax"); + add_oid_str_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file"); + add_oid_str_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax"); } diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index e95c2cebcc..d1b47a4865 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -2238,9 +2239,9 @@ void proto_register_gsm_map(void) { gsm_map_tap = register_tap("gsm_map"); /* #include "packet-gsm_map-dis-tab.c" */ - register_ber_oid_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" ); - register_ber_oid_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" ); - /*register_ber_oid_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" ); + add_oid_str_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" ); + add_oid_str_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" ); + /*add_oid_str_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" ); * * Register our configuration options, particularly our ssn:s * Set default SSNs diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 6c5734c942..27463785e2 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -1424,26 +1424,26 @@ proto_reg_handoff_ldap(void) gssapi_wrap_handle = find_dissector("gssapi_verf"); /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */ - register_ber_oid_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING"); - register_ber_oid_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID"); - register_ber_oid_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID"); - register_ber_oid_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID"); - register_ber_oid_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID"); - register_ber_oid_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID"); - register_ber_oid_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID"); - register_ber_oid_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID"); - register_ber_oid_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID"); - register_ber_oid_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID"); - register_ber_oid_name("1.2.840.113556.1.4.970 ","None"); - register_ber_oid_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID"); - register_ber_oid_name("1.3.6.1.4.1.1466.101.119.1","None"); - register_ber_oid_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID"); - register_ber_oid_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV"); + add_oid_str_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING"); + add_oid_str_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID"); + add_oid_str_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID"); + add_oid_str_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID"); + add_oid_str_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID"); + add_oid_str_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID"); + add_oid_str_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID"); + add_oid_str_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID"); + add_oid_str_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID"); + add_oid_str_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID"); + add_oid_str_name("1.2.840.113556.1.4.970 ","None"); + add_oid_str_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID"); + add_oid_str_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID"); + add_oid_str_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID"); + add_oid_str_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID"); + add_oid_str_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID"); + add_oid_str_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID"); + add_oid_str_name("1.3.6.1.4.1.1466.101.119.1","None"); + add_oid_str_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID"); + add_oid_str_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV"); register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap); diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c index 1bc6d1053a..45f32b10cf 100644 --- a/asn1/pkixproxy/packet-pkixproxy-template.c +++ b/asn1/pkixproxy/packet-pkixproxy-template.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -76,8 +77,8 @@ void proto_register_pkixproxy(void) { /*--- proto_reg_handoff_pkixproxy -------------------------------------------*/ void proto_reg_handoff_pkixproxy(void) { #include "packet-pkixproxy-dis-tab.c" - register_ber_oid_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage"); - register_ber_oid_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll"); - register_ber_oid_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent"); + add_oid_str_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage"); + add_oid_str_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll"); + add_oid_str_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent"); } diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index 352f5c1427..0ff052a398 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -161,7 +162,7 @@ proto_reg_handoff_tcap(void) prefs_initialized = TRUE; } - register_ber_oid_name("0.0.17.773.1.1.1", + add_oid_str_name("0.0.17.773.1.1.1", "itu-t(0) recommendation(0) q(17) 773 as(1) dialogue-as(1) version1(1)"); data_handle = find_dissector("data"); diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c index d1a5de13e0..133ce7609e 100644 --- a/asn1/wlancertextn/packet-wlancertextn-template.c +++ b/asn1/wlancertextn/packet-wlancertextn-template.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -80,7 +81,7 @@ void proto_register_wlancertextn(void) { /*--- proto_reg_handoff_wlancertextn -------------------------------------------*/ void proto_reg_handoff_wlancertextn(void) { #include "packet-wlancertextn-dis-tab.c" - register_ber_oid_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP"); - register_ber_oid_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN"); + add_oid_str_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP"); + add_oid_str_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN"); } diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index a21c95bb96..5dcfdb4860 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -86,7 +87,7 @@ call_x411_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *p sprintf(extension_oid, "%s.%d", base_oid, extension_id); - name = get_ber_oid_name(extension_oid); + name = get_oid_str_name(extension_oid); proto_item_append_text(tree, " (%s)", name ? name : extension_oid); return call_ber_oid_callback(extension_oid, tvb, offset, pinfo, tree); @@ -230,7 +231,7 @@ void proto_reg_handoff_x411(void) { /* APPLICATION CONTEXT */ - register_ber_oid_name("2.6.0.1.6", "id-ac-mts-transfer"); + add_oid_str_name("2.6.0.1.6", "id-ac-mts-transfer"); /* ABSTRACT SYNTAXES */ diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index e11d91bd73..70536a7b9f 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -229,7 +229,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" offset=call_x411_oid_callback("x411.extension", tvb, offset, pinfo, tree); else if(object_identifier_id) { call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id); } @@ -327,7 +327,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" %(DEFAULT_BODY)s if(content_type_id) { - name = get_ber_oid_name(content_type_id); + name = get_oid_str_name(content_type_id); if(!name) name = content_type_id; diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 7768873e5a..213eb75d4e 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -114,7 +114,7 @@ ForwardedContentParameters B "2.6.1.11.17.1.3.26.0.4406.0.4.1" "id-ep-content- %(DEFAULT_BODY)s - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%%s)", name ? name : object_identifier_id); #.FN_BODY T_value diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index e0cf45e4d2..e8842d6c8b 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -71,7 +71,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate %(DEFAULT_BODY)s if(algorithm_id) { - name = get_ber_oid_name(algorithm_id); + name = get_oid_str_name(algorithm_id); proto_item_append_text(tree, " (%%s)", name ? name : algorithm_id); } @@ -88,7 +88,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate %(DEFAULT_BODY)s if(extension_id) { - name = get_ber_oid_name(extension_id); + name = get_oid_str_name(extension_id); proto_item_append_text(tree, " (%%s)", name ? name : extension_id); } diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index e4f96c29a3..7c12f17764 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -141,7 +141,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" if(object_identifier_id) { /* see if we can find a nice name */ - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); if(!name) name = object_identifier_id; if(doing_dn) { /* append it to the RDN */ @@ -197,7 +197,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ - if(!(name = get_ber_oid_name(object_identifier_id))) + if(!(name = get_oid_str_name(object_identifier_id))) name = object_identifier_id; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s %%s", name, fmt, value); diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 3ee2ecdc26..f8433bf71e 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -81,33 +82,33 @@ void proto_reg_handoff_x509sat(void) { /* OBJECT CLASSES */ - register_ber_oid_name("2.5.6.0", "top"); - register_ber_oid_name("2.5.6.1", "alias"); - register_ber_oid_name("2.5.6.2", "country"); - register_ber_oid_name("2.5.6.3", "locality"); - register_ber_oid_name("2.5.6.4", "organization"); - register_ber_oid_name("2.5.6.1", "organizationalUnit"); - register_ber_oid_name("2.5.6.6", "person"); - register_ber_oid_name("2.5.6.7", "organizationalPerson"); - register_ber_oid_name("2.5.6.8", "organizationalRole"); - register_ber_oid_name("2.5.6.9", "groupOfNames"); - register_ber_oid_name("2.5.6.10", "residentialPerson"); - register_ber_oid_name("2.5.6.11", "applicationProcess"); - register_ber_oid_name("2.5.6.12", "applicationEntity"); - register_ber_oid_name("2.5.6.13", "dSA"); - register_ber_oid_name("2.5.6.14", "device"); - register_ber_oid_name("2.5.6.15", "strongAuthenticationUser"); - register_ber_oid_name("2.5.6.16", "certificationAuthority"); - register_ber_oid_name("2.5.6.16.2", "certificationAuthorityV2"); - register_ber_oid_name("2.5.6.17", "groupOfUniqueNames"); - register_ber_oid_name("2.5.6.18", "userSecurityInformation"); - register_ber_oid_name("2.5.6.19", "cRLDistributionPoint"); - register_ber_oid_name("2.5.6.20", "dmd"); - register_ber_oid_name("2.5.6.21", "pkiUser"); - register_ber_oid_name("2.5.6.22", "pkiCA"); + add_oid_str_name("2.5.6.0", "top"); + add_oid_str_name("2.5.6.1", "alias"); + add_oid_str_name("2.5.6.2", "country"); + add_oid_str_name("2.5.6.3", "locality"); + add_oid_str_name("2.5.6.4", "organization"); + add_oid_str_name("2.5.6.1", "organizationalUnit"); + add_oid_str_name("2.5.6.6", "person"); + add_oid_str_name("2.5.6.7", "organizationalPerson"); + add_oid_str_name("2.5.6.8", "organizationalRole"); + add_oid_str_name("2.5.6.9", "groupOfNames"); + add_oid_str_name("2.5.6.10", "residentialPerson"); + add_oid_str_name("2.5.6.11", "applicationProcess"); + add_oid_str_name("2.5.6.12", "applicationEntity"); + add_oid_str_name("2.5.6.13", "dSA"); + add_oid_str_name("2.5.6.14", "device"); + add_oid_str_name("2.5.6.15", "strongAuthenticationUser"); + add_oid_str_name("2.5.6.16", "certificationAuthority"); + add_oid_str_name("2.5.6.16.2", "certificationAuthorityV2"); + add_oid_str_name("2.5.6.17", "groupOfUniqueNames"); + add_oid_str_name("2.5.6.18", "userSecurityInformation"); + add_oid_str_name("2.5.6.19", "cRLDistributionPoint"); + add_oid_str_name("2.5.6.20", "dmd"); + add_oid_str_name("2.5.6.21", "pkiUser"); + add_oid_str_name("2.5.6.22", "pkiCA"); - register_ber_oid_name("2.5.6.28", "parent"); - register_ber_oid_name("2.5.6.29", "child"); + add_oid_str_name("2.5.6.28", "parent"); + add_oid_str_name("2.5.6.29", "child"); } diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index f929e461ed..3134e8575a 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -142,7 +143,7 @@ static int hf_acp133_OnSupported_acp127_pn = -1; static int hf_acp133_OnSupported_acp127_tn = -1; /*--- End of included file: packet-acp133-hf.c ---*/ -#line 55 "packet-acp133-template.c" +#line 56 "packet-acp133-template.c" /* Initialize the subtree pointers */ static gint ett_acp133 = -1; @@ -170,7 +171,7 @@ static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; /*--- End of included file: packet-acp133-ett.c ---*/ -#line 59 "packet-acp133-template.c" +#line 60 "packet-acp133-template.c" /*--- Included file: packet-acp133-fn.c ---*/ @@ -1155,7 +1156,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree /*--- End of included file: packet-acp133-fn.c ---*/ -#line 61 "packet-acp133-template.c" +#line 62 "packet-acp133-template.c" /*--- proto_register_acp133 -------------------------------------------*/ @@ -1477,7 +1478,7 @@ void proto_register_acp133(void) { "", HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 70 "packet-acp133-template.c" +#line 71 "packet-acp133-template.c" }; /* List of subtrees */ @@ -1507,7 +1508,7 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_ExtendedContentType, /*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 76 "packet-acp133-template.c" +#line 77 "packet-acp133-template.c" }; /* Register protocol */ @@ -1568,59 +1569,59 @@ void proto_reg_handoff_acp133(void) { /*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 92 "packet-acp133-template.c" +#line 93 "packet-acp133-template.c" /* X.402 Object Classes */ - register_ber_oid_name("2.6.5.1.0","id-oc-mhs-distribution-list"); - register_ber_oid_name("2.6.5.1.1","id-oc-mhs-message-store"); - register_ber_oid_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent"); - register_ber_oid_name("2.6.5.1.3","id-oc-mhs-user"); + add_oid_str_name("2.6.5.1.0","id-oc-mhs-distribution-list"); + add_oid_str_name("2.6.5.1.1","id-oc-mhs-message-store"); + add_oid_str_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent"); + add_oid_str_name("2.6.5.1.3","id-oc-mhs-user"); /* SDN.701 Object Classes */ - register_ber_oid_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user"); - register_ber_oid_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms"); + add_oid_str_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user"); + add_oid_str_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms"); /* ACP133 Object Classes */ - register_ber_oid_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData"); - register_ber_oid_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator"); - register_ber_oid_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName"); - register_ber_oid_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit"); - register_ber_oid_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled"); - register_ber_oid_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription"); - register_ber_oid_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser"); - register_ber_oid_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList"); - register_ber_oid_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127"); - register_ber_oid_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway"); - register_ber_oid_name("2.16.840.1.101.2.2.3.60", "id-oc-network"); - register_ber_oid_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions"); - register_ber_oid_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation"); - register_ber_oid_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson"); - register_ber_oid_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent"); - register_ber_oid_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser"); - register_ber_oid_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA"); - register_ber_oid_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB"); - register_ber_oid_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB"); + add_oid_str_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData"); + add_oid_str_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator"); + add_oid_str_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName"); + add_oid_str_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit"); + add_oid_str_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled"); + add_oid_str_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription"); + add_oid_str_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser"); + add_oid_str_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList"); + add_oid_str_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127"); + add_oid_str_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway"); + add_oid_str_name("2.16.840.1.101.2.2.3.60", "id-oc-network"); + add_oid_str_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions"); + add_oid_str_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation"); + add_oid_str_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson"); + add_oid_str_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent"); + add_oid_str_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA"); + add_oid_str_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser"); + add_oid_str_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA"); + add_oid_str_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB"); + add_oid_str_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB"); /* gateway types */ - register_ber_oid_name("2.16.840.1.101.2.2.5.0", "acp120-acp127"); - register_ber_oid_name("2.16.840.1.101.2.2.5.1", "acp120-janap128"); - register_ber_oid_name("2.16.840.1.101.2.2.5.2", "acp120-mhs"); - register_ber_oid_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs"); - register_ber_oid_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822"); - register_ber_oid_name("2.16.840.1.101.2.2.5.5", "boundaryMTA"); - register_ber_oid_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs"); - register_ber_oid_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822"); - register_ber_oid_name("2.16.840.1.101.2.2.5.8", "mta-acp127"); + add_oid_str_name("2.16.840.1.101.2.2.5.0", "acp120-acp127"); + add_oid_str_name("2.16.840.1.101.2.2.5.1", "acp120-janap128"); + add_oid_str_name("2.16.840.1.101.2.2.5.2", "acp120-mhs"); + add_oid_str_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs"); + add_oid_str_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822"); + add_oid_str_name("2.16.840.1.101.2.2.5.5", "boundaryMTA"); + add_oid_str_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs"); + add_oid_str_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822"); + add_oid_str_name("2.16.840.1.101.2.2.5.8", "mta-acp127"); } diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index e43afcfcbb..c3b696ccac 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -179,7 +180,7 @@ static int hf_acse_ACSE_requirements_higher_level_association = -1; static int hf_acse_ACSE_requirements_nested_association = -1; /*--- End of included file: packet-acse-hf.c ---*/ -#line 64 "packet-acse-template.c" +#line 65 "packet-acse-template.c" /* Initialize the subtree pointers */ static gint ett_acse = -1; @@ -223,7 +224,7 @@ static gint ett_acse_Authentication_value_other = -1; static gint ett_acse_Authentication_value = -1; /*--- End of included file: packet-acse-ett.c ---*/ -#line 68 "packet-acse-template.c" +#line 69 "packet-acse-template.c" static struct SESSION_DATA_STRUCTURE* session = NULL; @@ -1875,7 +1876,7 @@ dissect_acse_AE_title(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack /*--- End of included file: packet-acse-fn.c ---*/ -#line 144 "packet-acse-template.c" +#line 145 "packet-acse-template.c" /* @@ -2404,7 +2405,7 @@ void proto_register_acse(void) { "", HFILL }}, /*--- End of included file: packet-acse-hfarr.c ---*/ -#line 248 "packet-acse-template.c" +#line 249 "packet-acse-template.c" }; /* List of subtrees */ @@ -2450,7 +2451,7 @@ void proto_register_acse(void) { &ett_acse_Authentication_value, /*--- End of included file: packet-acse-ettarr.c ---*/ -#line 254 "packet-acse-template.c" +#line 255 "packet-acse-template.c" }; /* Register protocol */ @@ -2468,7 +2469,7 @@ void proto_register_acse(void) { void proto_reg_handoff_acse(void) { /*#include "packet-acse-dis-tab.c"*/ - register_ber_oid_name("2.2.3.1.1","aCSE-id"); + add_oid_str_name("2.2.3.1.1","aCSE-id"); register_ber_oid_dissector(ACSE_APDU_OID, dissect_acse, proto_acse, "acse-as-id"); diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index be3fcf82ee..1c5fe40b61 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -187,21 +187,6 @@ register_ber_oid_dissector(const char *oid, dissector_t dissector, int proto, co add_oid_str_name(oid, name); } -/* Register the oid name to get translation in proto dissection */ -void -register_ber_oid_name(const char *oid, const char *name) -{ - add_oid_str_name(oid, name); -} - -/* Get oid name from hash table to get translation in proto dissection(packet-per.c) */ -const char * -get_ber_oid_name(const char *oid) -{ - return get_oid_str_name(oid); -} - - int dissect_ber_tagged_type(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gint8 tag_cls, gint32 tag_tag, gboolean tag_impl, ber_type_fn type) { gint8 tmp_cls; @@ -2427,7 +2412,7 @@ proto_reg_handoff_ber(void) { dissector_handle_t ber_handle; - register_ber_oid_name("2.1.1","joint-iso-itu-t(2) asn1(1) basic-encoding(1)"); + add_oid_str_name("2.1.1","joint-iso-itu-t(2) asn1(1) basic-encoding(1)"); ber_handle = create_dissector_handle(dissect_ber, proto_ber); dissector_add("wtap_encap", WTAP_ENCAP_BER, ber_handle); diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index f820f79e39..c61f4f72e8 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -173,9 +173,7 @@ extern proto_item *get_ber_last_created_item(void); int call_ber_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); void register_ber_oid_dissector_handle(const char *oid, dissector_handle_t dissector, int proto, const char *name); void register_ber_oid_dissector(const char *oid, dissector_t dissector, int proto, const char *name); -void register_ber_oid_name(const char *oid, const char *name); void dissect_ber_oid_NULL_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -const char * get_ber_oid_name(const char *str); #endif /* __PACKET_BER_H__ */ diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 6e5dec5b6f..d3708eb5bb 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -580,7 +581,7 @@ static int hf_camel_OfferedCamel4Functionalities_criteriaForChangeOfPositionDP = static int hf_camel_OfferedCamel4Functionalities_serviceChangeDP = -1; /*--- End of included file: packet-camel-hf.c ---*/ -#line 90 "packet-camel-template.c" +#line 91 "packet-camel-template.c" static guint global_tcap_itu_ssn = 0; /* Initialize the subtree pointers */ @@ -808,7 +809,7 @@ static gint ett_camel_ResetTimerGPRSArg = -1; static gint ett_camel_CancelFailedPARAM = -1; /*--- End of included file: packet-camel-ett.c ---*/ -#line 108 "packet-camel-template.c" +#line 109 "packet-camel-template.c" /* Preference settings default */ @@ -1930,7 +1931,7 @@ static const value_string camel_AChBillingChargingCharacteristics_vals[] = { }; static const ber_choice_t AChBillingChargingCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_actimeDurationCharging_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_actimeDurationCharging_impl }, { 0, 0, 0, 0, NULL } }; @@ -1970,8 +1971,8 @@ static const value_string camel_LegID_vals[] = { }; static const ber_choice_t LegID_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_sendingSideID_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_receivingSideID_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendingSideID_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receivingSideID_impl }, { 0, 0, 0, 0, NULL } }; @@ -2029,8 +2030,8 @@ static const value_string camel_AChChargingAddress_vals[] = { }; static const ber_choice_t AChChargingAddress_choice[] = { - { 2, BER_CLASS_CON, 2, 0, dissect_legID_impl }, - { 50, BER_CLASS_CON, 50, 0, dissect_srfConnection_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_legID_impl }, + { 50, BER_CLASS_CON, 50, BER_FLAGS_IMPLTAG, dissect_srfConnection_impl }, { 0, 0, 0, 0, NULL } }; @@ -2353,7 +2354,7 @@ static const value_string camel_AudibleIndicator_vals[] = { static const ber_choice_t AudibleIndicator_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_tone }, - { 1, BER_CLASS_CON, 1, 0, dissect_burstList_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_burstList_impl }, { 0, 0, 0, 0, NULL } }; @@ -2463,10 +2464,10 @@ static const value_string camel_BasicGapCriteria_vals[] = { }; static const ber_choice_t BasicGapCriteria_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_calledAddressValue_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_gapOnService_impl }, - { 29, BER_CLASS_CON, 29, 0, dissect_calledAddressAndService_impl }, - { 30, BER_CLASS_CON, 30, 0, dissect_callingAddressAndService_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_calledAddressValue_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gapOnService_impl }, + { 29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_calledAddressAndService_impl }, + { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_callingAddressAndService_impl }, { 0, 0, 0, 0, NULL } }; @@ -2659,13 +2660,13 @@ static const value_string camel_ChangeOfLocation_vals[] = { }; static const ber_choice_t ChangeOfLocation_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_cellGlobalId_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_serviceAreaId_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_locationAreaId_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_inter_SystemHandOver_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_inter_PLMNHandOver_impl }, - { 5, BER_CLASS_CON, 5, 0, dissect_inter_MSCHandOver_impl }, - { 6, BER_CLASS_CON, 6, 0, dissect_changeOfLocationAlt_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cellGlobalId_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_serviceAreaId_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_locationAreaId_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_inter_SystemHandOver_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_inter_PLMNHandOver_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_inter_MSCHandOver_impl }, + { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_changeOfLocationAlt_impl }, { 0, 0, 0, 0, NULL } }; @@ -2723,9 +2724,9 @@ static const value_string camel_DpSpecificCriteria_vals[] = { }; static const ber_choice_t DpSpecificCriteria_choice[] = { - { 1, BER_CLASS_CON, 1, 0, dissect_applicationTimer_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_midCallControlInfo_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_dpSpecificCriteriaAlt_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_applicationTimer_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_midCallControlInfo_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dpSpecificCriteriaAlt_impl }, { 0, 0, 0, 0, NULL } }; @@ -2850,7 +2851,7 @@ static const value_string camel_BearerCapability_vals[] = { }; static const ber_choice_t BearerCapability_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_bearerCap_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_bearerCap_impl }, { 0, 0, 0, 0, NULL } }; @@ -3008,7 +3009,7 @@ static const value_string camel_ReceivingSideID_vals[] = { }; static const ber_choice_t ReceivingSideID_choice[] = { - { 1, BER_CLASS_CON, 1, 0, dissect_receivingSideID_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receivingSideID_impl }, { 0, 0, 0, 0, NULL } }; @@ -3082,8 +3083,8 @@ static const value_string camel_TimeInformation_vals[] = { }; static const ber_choice_t TimeInformation_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_timeIfNoTariffSwitch_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_timeIfTariffSwitch_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeIfNoTariffSwitch_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timeIfTariffSwitch_impl }, { 0, 0, 0, 0, NULL } }; @@ -3144,7 +3145,7 @@ static const value_string camel_CAMEL_CallResult_vals[] = { }; static const ber_choice_t CAMEL_CallResult_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_timeDurationChargingResult_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeDurationChargingResult_impl }, { 0, 0, 0, 0, NULL } }; @@ -3255,7 +3256,7 @@ static const value_string camel_CAMEL_AChBillingChargingCharacteristics_vals[] = }; static const ber_choice_t CAMEL_AChBillingChargingCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_timeDurationCharging_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeDurationCharging_impl }, { 0, 0, 0, 0, NULL } }; @@ -3288,7 +3289,7 @@ static const value_string camel_SendingSideID_vals[] = { }; static const ber_choice_t SendingSideID_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_sendingSideID_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_sendingSideID_impl }, { 0, 0, 0, 0, NULL } }; @@ -3339,7 +3340,7 @@ static const value_string camel_CAMEL_FCIBillingChargingCharacteristics_vals[] = }; static const ber_choice_t CAMEL_FCIBillingChargingCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_fCIBCCCAMELsequence1_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fCIBCCCAMELsequence1_impl }, { 0, 0, 0, 0, NULL } }; @@ -3426,7 +3427,7 @@ static const value_string camel_CAMEL_FCISMSBillingChargingCharacteristics_vals[ }; static const ber_choice_t CAMEL_FCISMSBillingChargingCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_fCIBCCCAMELsequence3_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fCIBCCCAMELsequence3_impl }, { 0, 0, 0, 0, NULL } }; @@ -3464,9 +3465,9 @@ static const value_string camel_CAMEL_SCIBillingChargingCharacteristics_vals[] = }; static const ber_choice_t CAMEL_SCIBillingChargingCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_aOCBeforeAnswer_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_aOCAfterAnswer_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_aOC_extension_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_aOCBeforeAnswer_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_aOCAfterAnswer_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_aOC_extension_impl }, { 0, 0, 0, 0, NULL } }; @@ -3586,8 +3587,8 @@ static const value_string camel_ChargingCharacteristics_vals[] = { }; static const ber_choice_t ChargingCharacteristics_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_maxTransferredVolume_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_maxElapsedTime_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_maxTransferredVolume_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_maxElapsedTime_impl }, { 0, 0, 0, 0, NULL } }; @@ -3648,8 +3649,8 @@ static const value_string camel_TransferredVolume_vals[] = { }; static const ber_choice_t TransferredVolume_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_volumeIfNoTariffSwitch_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_volumeIfTariffSwitch_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_volumeIfNoTariffSwitch_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_volumeIfTariffSwitch_impl }, { 0, 0, 0, 0, NULL } }; @@ -3710,8 +3711,8 @@ static const value_string camel_ElapsedTime_vals[] = { }; static const ber_choice_t ElapsedTime_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_timeGPRSIfNoTariffSwitch_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_timeGPRSIfTariffSwitch_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_timeGPRSIfNoTariffSwitch_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_timeGPRSIfTariffSwitch_impl }, { 0, 0, 0, 0, NULL } }; @@ -3735,8 +3736,8 @@ static const value_string camel_ChargingResult_vals[] = { }; static const ber_choice_t ChargingResult_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_transferredVolume_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_elapsedTime_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transferredVolume_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_elapsedTime_impl }, { 0, 0, 0, 0, NULL } }; @@ -3809,8 +3810,8 @@ static const value_string camel_TransferredVolumeRollOver_vals[] = { }; static const ber_choice_t TransferredVolumeRollOver_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_rOVolumeIfNoTariffSwitch_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_rOVolumeIfTariffSwitch_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rOVolumeIfNoTariffSwitch_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rOVolumeIfTariffSwitch_impl }, { 0, 0, 0, 0, NULL } }; @@ -3852,8 +3853,8 @@ static const value_string camel_ElapsedTimeRollOver_vals[] = { }; static const ber_choice_t ElapsedTimeRollOver_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_rOTimeGPRSIfNoTariffSwitch_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_rOTimeGPRSIfTariffSwitch_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_rOTimeGPRSIfNoTariffSwitch_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rOTimeGPRSIfTariffSwitch_impl }, { 0, 0, 0, 0, NULL } }; @@ -3877,8 +3878,8 @@ static const value_string camel_ChargingRollOver_vals[] = { }; static const ber_choice_t ChargingRollOver_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_transferredVolumeRollOver_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_elapsedTimeRollOver_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_transferredVolumeRollOver_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_elapsedTimeRollOver_impl }, { 0, 0, 0, 0, NULL } }; @@ -3948,7 +3949,7 @@ static const value_string camel_CollectedInfo_vals[] = { }; static const ber_choice_t CollectedInfo_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_collectedDigits_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_collectedDigits_impl }, { 0, 0, 0, 0, NULL } }; @@ -4331,8 +4332,8 @@ static const value_string camel_T_midCallEvents_vals[] = { }; static const ber_choice_t T_midCallEvents_choice[] = { - { 3, BER_CLASS_CON, 3, 0, dissect_dTMFDigitsCompleted_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_dTMFDigitsTimeOut_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsCompleted_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsTimeOut_impl }, { 0, 0, 0, 0, NULL } }; @@ -4450,8 +4451,8 @@ static const value_string camel_T_midCallEvents1_vals[] = { }; static const ber_choice_t T_midCallEvents1_choice[] = { - { 3, BER_CLASS_CON, 3, 0, dissect_dTMFDigitsCompleted_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_dTMFDigitsTimeOut_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsCompleted_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_dTMFDigitsTimeOut_impl }, { 0, 0, 0, 0, NULL } }; @@ -4585,17 +4586,17 @@ static const value_string camel_MetDPCriterion_vals[] = { }; static const ber_choice_t MetDPCriterion_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_enteringCellGlobalId_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_leavingCellGlobalId_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_enteringServiceAreaId_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_leavingServiceAreaId_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_enteringLocationAreaId_impl }, - { 5, BER_CLASS_CON, 5, 0, dissect_leavingLocationAreaId_impl }, - { 6, BER_CLASS_CON, 6, 0, dissect_inter_SystemHandOverToUMTS_impl }, - { 7, BER_CLASS_CON, 7, 0, dissect_inter_SystemHandOverToGSM_impl }, - { 8, BER_CLASS_CON, 8, 0, dissect_inter_PLMNHandOver_impl }, - { 9, BER_CLASS_CON, 9, 0, dissect_inter_MSCHandOver_impl }, - { 10, BER_CLASS_CON, 10, 0, dissect_metDPCriterionAlt_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_enteringCellGlobalId_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_leavingCellGlobalId_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_enteringServiceAreaId_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_leavingServiceAreaId_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_enteringLocationAreaId_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_leavingLocationAreaId_impl }, + { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_inter_SystemHandOverToUMTS_impl }, + { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_inter_SystemHandOverToGSM_impl }, + { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_inter_PLMNHandOver_impl }, + { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_inter_MSCHandOver_impl }, + { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_metDPCriterionAlt_impl }, { 0, 0, 0, 0, NULL } }; @@ -4686,23 +4687,23 @@ static const value_string camel_EventSpecificInformationBCSM_vals[] = { }; static const ber_choice_t EventSpecificInformationBCSM_choice[] = { - { 2, BER_CLASS_CON, 2, 0, dissect_routeSelectFailureSpecificInfo_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_oCalledPartyBusySpecificInfo_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_oNoAnswerSpecificInfo_impl }, - { 5, BER_CLASS_CON, 5, 0, dissect_oAnswerSpecificInfo_impl }, - { 6, BER_CLASS_CON, 6, 0, dissect_oMidCallSpecificInfo_impl }, - { 7, BER_CLASS_CON, 7, 0, dissect_oDisconnectSpecificInfo_impl }, - { 8, BER_CLASS_CON, 8, 0, dissect_tBusySpecificInfo_impl }, - { 9, BER_CLASS_CON, 9, 0, dissect_tNoAnswerSpecificInfo_impl }, - { 10, BER_CLASS_CON, 10, 0, dissect_tAnswerSpecificInfo_impl }, - { 11, BER_CLASS_CON, 11, 0, dissect_tMidCallSpecificInfo_impl }, - { 12, BER_CLASS_CON, 12, 0, dissect_tDisconnectSpecificInfo_impl }, - { 13, BER_CLASS_CON, 13, 0, dissect_oTermSeizedSpecificInfo_impl }, - { 20, BER_CLASS_CON, 20, 0, dissect_callAcceptedSpecificInfo_impl }, - { 21, BER_CLASS_CON, 21, 0, dissect_oAbandonSpecificInfo_impl }, - { 50, BER_CLASS_CON, 50, 0, dissect_oChangeOfPositionSpecificInfo_impl }, - { 51, BER_CLASS_CON, 51, 0, dissect_tChangeOfPositionSpecificInfo_impl }, - { 52, BER_CLASS_CON, 52, 0, dissect_dpSpecificInfoAlt_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_routeSelectFailureSpecificInfo_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_oCalledPartyBusySpecificInfo_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_oNoAnswerSpecificInfo_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_oAnswerSpecificInfo_impl }, + { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_oMidCallSpecificInfo_impl }, + { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_oDisconnectSpecificInfo_impl }, + { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_tBusySpecificInfo_impl }, + { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_tNoAnswerSpecificInfo_impl }, + { 10, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_tAnswerSpecificInfo_impl }, + { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_tMidCallSpecificInfo_impl }, + { 12, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_tDisconnectSpecificInfo_impl }, + { 13, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_oTermSeizedSpecificInfo_impl }, + { 20, BER_CLASS_CON, 20, BER_FLAGS_IMPLTAG, dissect_callAcceptedSpecificInfo_impl }, + { 21, BER_CLASS_CON, 21, BER_FLAGS_IMPLTAG, dissect_oAbandonSpecificInfo_impl }, + { 50, BER_CLASS_CON, 50, BER_FLAGS_IMPLTAG, dissect_oChangeOfPositionSpecificInfo_impl }, + { 51, BER_CLASS_CON, 51, BER_FLAGS_IMPLTAG, dissect_tChangeOfPositionSpecificInfo_impl }, + { 52, BER_CLASS_CON, 52, BER_FLAGS_IMPLTAG, dissect_dpSpecificInfoAlt_impl }, { 0, 0, 0, 0, NULL } }; @@ -4830,10 +4831,10 @@ static const value_string camel_EventSpecificInformationSMS_vals[] = { }; static const ber_choice_t EventSpecificInformationSMS_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_o_smsFailureSpecificInfo_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_o_smsSubmittedSpecificInfo_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_t_smsFailureSpecificInfo_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_t_smsDeliverySpecificInfo_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_o_smsFailureSpecificInfo_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_o_smsSubmittedSpecificInfo_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_t_smsFailureSpecificInfo_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_t_smsDeliverySpecificInfo_impl }, { 0, 0, 0, 0, NULL } }; @@ -5123,11 +5124,11 @@ static const value_string camel_VariablePart_vals[] = { }; static const ber_choice_t VariablePart_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_integer_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_number_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_time_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_date_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_price_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_integer_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_number_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_time_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_date_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_price_impl }, { 0, 0, 0, 0, NULL } }; @@ -5187,10 +5188,10 @@ static const value_string camel_MessageID_vals[] = { }; static const ber_choice_t MessageID_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_elementaryMessageID_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_text_impl }, - { 29, BER_CLASS_CON, 29, 0, dissect_elementaryMessageIDs_impl }, - { 30, BER_CLASS_CON, 30, 0, dissect_variableMessage_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_elementaryMessageID_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_text_impl }, + { 29, BER_CLASS_CON, 29, BER_FLAGS_IMPLTAG, dissect_elementaryMessageIDs_impl }, + { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_variableMessage_impl }, { 0, 0, 0, 0, NULL } }; @@ -5268,8 +5269,8 @@ static const value_string camel_InformationToSend_vals[] = { }; static const ber_choice_t InformationToSend_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_inbandInfo_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_tone1_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inbandInfo_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_tone1_impl }, { 0, 0, 0, 0, NULL } }; @@ -5293,8 +5294,8 @@ static const value_string camel_GapTreatment_vals[] = { }; static const ber_choice_t GapTreatment_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_informationToSend_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_releaseCause_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_informationToSend_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_releaseCause_impl }, { 0, 0, 0, 0, NULL } }; @@ -5347,8 +5348,8 @@ static const value_string camel_GPRS_QoS_vals[] = { }; static const ber_choice_t GPRS_QoS_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_short_QoS_format_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_long_QoS_format_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_short_QoS_format_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_long_QoS_format_impl }, { 0, 0, 0, 0, NULL } }; @@ -5924,12 +5925,12 @@ static const value_string camel_GPRSEventSpecificInformation_vals[] = { }; static const ber_choice_t GPRSEventSpecificInformation_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_attachChangeOfPositionSpecificInformation_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_pdp_ContextchangeOfPositionSpecificInformation_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_detachSpecificInformation_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_disconnectSpecificInformation_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_pDPContextEstablishmentSpecificInformation_impl }, - { 5, BER_CLASS_CON, 5, 0, dissect_pDPContextEstablishmentAcknowledgementSpecificInformation_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_attachChangeOfPositionSpecificInformation_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pdp_ContextchangeOfPositionSpecificInformation_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_detachSpecificInformation_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_disconnectSpecificInformation_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_pDPContextEstablishmentSpecificInformation_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_pDPContextEstablishmentAcknowledgementSpecificInformation_impl }, { 0, 0, 0, 0, NULL } }; @@ -6052,8 +6053,8 @@ static const value_string camel_LegOrCallSegment_vals[] = { }; static const ber_choice_t LegOrCallSegment_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_callSegmentID_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_legID_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callSegmentID_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_legID_impl }, { 0, 0, 0, 0, NULL } }; @@ -6192,10 +6193,10 @@ static const value_string camel_RequestedInformationValue_vals[] = { }; static const ber_choice_t RequestedInformationValue_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_callAttemptElapsedTimeValue_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_callStopTimeValue_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_callConnectedElapsedTimeValue_impl }, - { 30, BER_CLASS_CON, 30, 0, dissect_releaseCauseValue_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callAttemptElapsedTimeValue_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_callStopTimeValue_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_callConnectedElapsedTimeValue_impl }, + { 30, BER_CLASS_CON, 30, BER_FLAGS_IMPLTAG, dissect_releaseCauseValue_impl }, { 0, 0, 0, 0, NULL } }; @@ -6786,9 +6787,9 @@ static const value_string camel_CancelArg_vals[] = { }; static const ber_choice_t CancelArg_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_invokeID_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_allRequests_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_callSegmentToCancel_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_invokeID_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_allRequests_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_callSegmentToCancel_impl }, { 0, 0, 0, 0, NULL } }; @@ -6849,7 +6850,7 @@ static const value_string camel_ReceivedInformationArg_vals[] = { }; static const ber_choice_t ReceivedInformationArg_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_digitsResponse_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_digitsResponse_impl }, { 0, 0, 0, 0, NULL } }; @@ -6981,10 +6982,10 @@ static const value_string camel_SubscriberState_vals[] = { }; static const ber_choice_t SubscriberState_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_assumedIdle_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_camelBusy_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_assumedIdle_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_camelBusy_impl }, { 2, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_netDetNotReachable }, - { 3, BER_CLASS_CON, 2, 0, dissect_notProvidedFromVLR_impl }, + { 3, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_notProvidedFromVLR_impl }, { 0, 0, 0, 0, NULL } }; @@ -7008,8 +7009,8 @@ static const value_string camel_CellIdOrLAI_vals[] = { }; static const ber_choice_t CellIdOrLAI_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_cellIdFixedLength_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_laiFixedLength_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cellIdFixedLength_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_laiFixedLength_impl }, { 0, 0, 0, 0, NULL } }; @@ -7290,8 +7291,8 @@ static const value_string camel_T_resourceAddress_vals[] = { }; static const ber_choice_t T_resourceAddress_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_ipRoutingAddress_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_none_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipRoutingAddress_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_none_impl }, { 0, 0, 0, 0, NULL } }; @@ -7395,8 +7396,8 @@ static const value_string camel_EntityReleasedArg_vals[] = { }; static const ber_choice_t EntityReleasedArg_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_callSegmentFailure_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_bCSM_Failure_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_callSegmentFailure_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_bCSM_Failure_impl }, { 0, 0, 0, 0, NULL } }; @@ -7970,7 +7971,7 @@ dissect_camel_TaskRefusedPARAM(gboolean implicit_tag _U_, tvbuff_t *tvb, int off /*--- End of included file: packet-camel-fn.c ---*/ -#line 186 "packet-camel-template.c" +#line 187 "packet-camel-template.c" const value_string camel_opr_code_strings[] = { @@ -10441,7 +10442,7 @@ void proto_register_camel(void) { "", HFILL }}, /*--- End of included file: packet-camel-hfarr.c ---*/ -#line 732 "packet-camel-template.c" +#line 733 "packet-camel-template.c" }; /* List of subtrees */ @@ -10669,7 +10670,7 @@ void proto_register_camel(void) { &ett_camel_CancelFailedPARAM, /*--- End of included file: packet-camel-ettarr.c ---*/ -#line 750 "packet-camel-template.c" +#line 751 "packet-camel-template.c" }; /* Register protocol */ @@ -10683,7 +10684,7 @@ void proto_register_camel(void) { register_ber_oid_dissector_handle("0.4.0.0.1.0.52.1",camel_handle, proto_camel, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network|umts-Network(1) applicationContext(0) cap-gsmSRF-to-gsmscf(52) version2(1)" ); register_ber_oid_dissector_handle("0.4.0.0.1.21.3.50",camel_handle, proto_camel, "itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) cAP3OE(21) ac(3) id-ac-CAP-gprsSSF-gsmSCF-AC(50)" ); - register_ber_oid_name("0.4.0.0.1.1.5.2","iitu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) cap-GPRS-ReferenceNumber(5) version3(2)"); + add_oid_str_name("0.4.0.0.1.1.5.2","iitu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) abstractSyntax(1) cap-GPRS-ReferenceNumber(5) version3(2)"); diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c index 1e0abe3d4a..4cab993609 100644 --- a/epan/dissectors/packet-cdt.c +++ b/epan/dissectors/packet-cdt.c @@ -129,7 +129,7 @@ dissect_cdt_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &obj_id); if (obj_id) { - const char *name = get_ber_oid_name (obj_id); + const char *name = get_oid_str_name (obj_id); if (!name) { name = obj_id; diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 273060af35..f5038b3097 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -212,7 +213,7 @@ static int hf_cmip_ProtocolVersion_version1 = -1; static int hf_cmip_ProtocolVersion_version2 = -1; /*--- End of included file: packet-cmip-hf.c ---*/ -#line 62 "packet-cmip-template.c" +#line 63 "packet-cmip-template.c" /* Initialize the subtree pointers */ static gint ett_cmip = -1; @@ -291,7 +292,7 @@ static gint ett_cmip_CMIPUserInfo = -1; static gint ett_cmip_ProtocolVersion = -1; /*--- End of included file: packet-cmip-ett.c ---*/ -#line 66 "packet-cmip-template.c" +#line 67 "packet-cmip-template.c" static guint32 opcode; @@ -2836,7 +2837,7 @@ dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, /*--- End of included file: packet-cmip-fn.c ---*/ -#line 90 "packet-cmip-template.c" +#line 91 "packet-cmip-template.c" static void @@ -3542,7 +3543,7 @@ void proto_register_cmip(void) { "", HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 231 "packet-cmip-template.c" +#line 232 "packet-cmip-template.c" }; /* List of subtrees */ @@ -3623,7 +3624,7 @@ void proto_register_cmip(void) { &ett_cmip_ProtocolVersion, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 237 "packet-cmip-template.c" +#line 238 "packet-cmip-template.c" }; /* Register protocol */ @@ -3646,8 +3647,8 @@ void proto_reg_handoff_cmip(void) { register_ber_oid_dissector("2.9.3.2.7.63", dissect_cmip_attribute_63, proto_cmip, "smi2AttributeID (7) nameBinding(63)"); register_ber_oid_dissector("2.9.3.2.7.65", dissect_cmip_attribute_65, proto_cmip, "smi2AttributeID (7) objectClass(65)"); - register_ber_oid_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)"); - register_ber_oid_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); + add_oid_str_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)"); + add_oid_str_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); } diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index e3879c8e0d..98093da61e 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -492,7 +492,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac if(object_identifier_id) { - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id); } @@ -754,7 +754,7 @@ const value_string cms_SignerIdentifier_vals[] = { static const ber_choice_t SignerIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, - { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, { 0, 0, 0, 0, NULL } }; @@ -900,7 +900,7 @@ static const value_string cms_RecipientIdentifier_vals[] = { static const ber_choice_t RecipientIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, - { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, { 0, 0, 0, 0, NULL } }; @@ -1003,8 +1003,8 @@ static const value_string cms_OriginatorIdentifierOrKey_vals[] = { static const ber_choice_t OriginatorIdentifierOrKey_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, - { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, - { 2, BER_CLASS_CON, 1, 0, dissect_originatorKey_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, + { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_originatorKey_impl }, { 0, 0, 0, 0, NULL } }; @@ -1255,8 +1255,8 @@ static const value_string cms_RecipientInfo_vals[] = { static const ber_choice_t RecipientInfo_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ktri }, - { 1, BER_CLASS_CON, 1, 0, dissect_kari_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_kekri_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_kari_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_kekri_impl }, { 0, 0, 0, 0, NULL } }; diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index f67d9833b6..f07433d744 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -117,7 +118,7 @@ static int hf_dap_familySelect = -1; /* T_familySelect */ static int hf_dap_familySelect_item = -1; /* OBJECT_IDENTIFIER */ static int hf_dap_name = -1; /* Name */ static int hf_dap_fromEntry = -1; /* BOOLEAN */ -static int hf_dap_entry_information = -1; /* T_information */ +static int hf_dap_entry_information = -1; /* T_entry_information */ static int hf_dap_entry_information_item = -1; /* EntryInformationItem */ static int hf_dap_attributeType = -1; /* AttributeType */ static int hf_dap_attribute = -1; /* Attribute */ @@ -129,7 +130,7 @@ static int hf_dap_familyEntries = -1; /* SEQUENCE_OF_FamilyEntry */ static int hf_dap_familyEntries_item = -1; /* FamilyEntry */ static int hf_dap_rdn = -1; /* RelativeDistinguishedName */ static int hf_dap_family_information = -1; /* FamilyInformation */ -static int hf_dap_information_item = -1; /* T_information_item */ +static int hf_dap_family_information_item = -1; /* T_family_information_item */ static int hf_dap_family_info = -1; /* SEQUENCE_OF_FamilyEntries */ static int hf_dap_family_info_item = -1; /* FamilyEntries */ static int hf_dap_filter_item = -1; /* FilterItem */ @@ -313,7 +314,7 @@ static int hf_dap_unsignedSearchResult = -1; /* SearchResultData */ static int hf_dap_signedSearchResult = -1; /* T_signedSearchResult */ static int hf_dap_searchResult = -1; /* SearchResultData */ static int hf_dap_add_entry = -1; /* SET_OF_Attribute */ -static int hf_dap_entry_item = -1; /* Attribute */ +static int hf_dap_add_entry_item = -1; /* Attribute */ static int hf_dap_targetSystem = -1; /* AccessPoint */ static int hf_dap_unsignedAddEntryArgument = -1; /* AddEntryArgumentData */ static int hf_dap_signedAddEntryArgument = -1; /* T_signedAddEntryArgument */ @@ -433,7 +434,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 70 "packet-dap-template.c" +#line 71 "packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; @@ -458,13 +459,13 @@ static gint ett_dap_SET_OF_ContextAssertion = -1; static gint ett_dap_FamilyReturn = -1; static gint ett_dap_T_familySelect = -1; static gint ett_dap_EntryInformation = -1; -static gint ett_dap_T_information = -1; +static gint ett_dap_T_entry_information = -1; static gint ett_dap_EntryInformationItem = -1; static gint ett_dap_FamilyEntries = -1; static gint ett_dap_SEQUENCE_OF_FamilyEntry = -1; static gint ett_dap_FamilyEntry = -1; static gint ett_dap_FamilyInformation = -1; -static gint ett_dap_T_information_item = -1; +static gint ett_dap_T_family_information_item = -1; static gint ett_dap_SEQUENCE_OF_FamilyEntries = -1; static gint ett_dap_Filter = -1; static gint ett_dap_SetOfFilter = -1; @@ -608,7 +609,7 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 74 "packet-dap-template.c" +#line 75 "packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ @@ -781,8 +782,8 @@ static int dissect_baseAtt(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_joinAtt(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_x509if_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_dap_joinAtt); } -static int dissect_entry_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_x509if_Attribute(FALSE, tvb, offset, pinfo, tree, hf_dap_entry_item); +static int dissect_add_entry_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_x509if_Attribute(FALSE, tvb, offset, pinfo, tree, hf_dap_add_entry_item); } static int dissect_targetSystem(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_dsp_AccessPoint(FALSE, tvb, offset, pinfo, tree, hf_dap_targetSystem); @@ -1661,19 +1662,19 @@ static int dissect_entry_information_item(packet_info *pinfo, proto_tree *tree, } -static const ber_sequence_t T_information_set_of[1] = { +static const ber_sequence_t T_entry_information_set_of[1] = { { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_entry_information_item }, }; static int -dissect_dap_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_dap_T_entry_information(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset, - T_information_set_of, hf_index, ett_dap_T_information); + T_entry_information_set_of, hf_index, ett_dap_T_entry_information); return offset; } static int dissect_entry_information(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_dap_T_information(FALSE, tvb, offset, pinfo, tree, hf_dap_entry_information); + return dissect_dap_T_entry_information(FALSE, tvb, offset, pinfo, tree, hf_dap_entry_information); } @@ -1702,33 +1703,33 @@ static int dissect_entries_item(packet_info *pinfo, proto_tree *tree, tvbuff_t * } -static const value_string dap_T_information_item_vals[] = { +static const value_string dap_T_family_information_item_vals[] = { { 0, "attributeType" }, { 1, "attribute" }, { 0, NULL } }; -static const ber_choice_t T_information_item_choice[] = { +static const ber_choice_t T_family_information_item_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attribute }, { 0, 0, 0, 0, NULL } }; static int -dissect_dap_T_information_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_dap_T_family_information_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_information_item_choice, hf_index, ett_dap_T_information_item, + T_family_information_item_choice, hf_index, ett_dap_T_family_information_item, NULL); return offset; } -static int dissect_information_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_dap_T_information_item(FALSE, tvb, offset, pinfo, tree, hf_dap_information_item); +static int dissect_family_information_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_dap_T_family_information_item(FALSE, tvb, offset, pinfo, tree, hf_dap_family_information_item); } static const ber_sequence_t FamilyInformation_sequence_of[1] = { - { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_information_item }, + { BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_family_information_item }, }; static int @@ -3971,7 +3972,7 @@ dissect_dap_SearchResultData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse static const ber_sequence_t SET_OF_Attribute_set_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_entry_item }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_add_entry_item }, }; static int @@ -5362,7 +5363,7 @@ dissect_dap_UpdateError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa /*--- End of included file: packet-dap-fn.c ---*/ -#line 76 "packet-dap-template.c" +#line 77 "packet-dap-template.c" /* * Dissect DAP PDUs inside a ROS PDUs @@ -5775,9 +5776,9 @@ void proto_register_dap(void) { { "information", "dap.information", FT_UINT32, BASE_DEC, NULL, 0, "FamilyEntry/information", HFILL }}, - { &hf_dap_information_item, + { &hf_dap_family_information_item, { "Item", "dap.information_item", - FT_UINT32, BASE_DEC, VALS(dap_T_information_item_vals), 0, + FT_UINT32, BASE_DEC, VALS(dap_T_family_information_item_vals), 0, "FamilyEntry/information/_item", HFILL }}, { &hf_dap_family_info, { "family-info", "dap.family_info", @@ -6511,7 +6512,7 @@ void proto_register_dap(void) { { "entry", "dap.entry", FT_UINT32, BASE_DEC, NULL, 0, "AddEntryArgumentData/entry", HFILL }}, - { &hf_dap_entry_item, + { &hf_dap_add_entry_item, { "Item", "dap.entry_item", FT_NONE, BASE_NONE, NULL, 0, "AddEntryArgumentData/entry/_item", HFILL }}, @@ -6981,7 +6982,7 @@ void proto_register_dap(void) { "", HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 278 "packet-dap-template.c" +#line 279 "packet-dap-template.c" }; /* List of subtrees */ @@ -7008,13 +7009,13 @@ void proto_register_dap(void) { &ett_dap_FamilyReturn, &ett_dap_T_familySelect, &ett_dap_EntryInformation, - &ett_dap_T_information, + &ett_dap_T_entry_information, &ett_dap_EntryInformationItem, &ett_dap_FamilyEntries, &ett_dap_SEQUENCE_OF_FamilyEntry, &ett_dap_FamilyEntry, &ett_dap_FamilyInformation, - &ett_dap_T_information_item, + &ett_dap_T_family_information_item, &ett_dap_SEQUENCE_OF_FamilyEntries, &ett_dap_Filter, &ett_dap_SetOfFilter, @@ -7158,7 +7159,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 284 "packet-dap-template.c" +#line 285 "packet-dap-template.c" }; module_t *dap_module; @@ -7194,7 +7195,7 @@ void proto_reg_handoff_dap(void) { /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.1", "id-ac-directory-access"); + add_oid_str_name("2.5.3.1", "id-ac-directory-access"); /* ABSTRACT SYNTAXES */ diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 445e2eb529..1ec388a908 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -84,7 +85,7 @@ static int hf_disp_EstablishParameter_PDU = -1; /* EstablishParameter */ static int hf_disp_ModificationParameter_PDU = -1; /* ModificationParameter */ static int hf_disp_ShadowingAgreementInfo_PDU = -1; /* ShadowingAgreementInfo */ static int hf_disp_modifiedSecondaryShadows = -1; /* SET_OF_SupplierAndConsumers */ -static int hf_disp_secondaryShadows_item = -1; /* SupplierAndConsumers */ +static int hf_disp_modifiedSecondaryShadows_item = -1; /* SupplierAndConsumers */ static int hf_disp_shadowSubject = -1; /* UnitOfReplication */ static int hf_disp_updateMode = -1; /* UpdateMode */ static int hf_disp_master = -1; /* AccessPoint */ @@ -189,7 +190,7 @@ static int hf_disp_signedShadowError = -1; /* T_signedShadowError */ static int hf_disp_shadowError = -1; /* ShadowErrorData */ /*--- End of included file: packet-disp-hf.c ---*/ -#line 73 "packet-disp-template.c" +#line 74 "packet-disp-template.c" /* Initialize the subtree pointers */ static gint ett_disp = -1; @@ -252,7 +253,7 @@ static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; /*--- End of included file: packet-disp-ett.c ---*/ -#line 77 "packet-disp-template.c" +#line 78 "packet-disp-template.c" /*--- Included file: packet-disp-fn.c ---*/ @@ -279,8 +280,8 @@ static int dissect_subordinate_changes(packet_info *pinfo, proto_tree *tree, tvb /*--- Fields for imported types ---*/ -static int dissect_secondaryShadows_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_dop_SupplierAndConsumers(FALSE, tvb, offset, pinfo, tree, hf_disp_secondaryShadows_item); +static int dissect_modifiedSecondaryShadows_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_dop_SupplierAndConsumers(FALSE, tvb, offset, pinfo, tree, hf_disp_modifiedSecondaryShadows_item); } static int dissect_master(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_dsp_AccessPoint(FALSE, tvb, offset, pinfo, tree, hf_disp_master); @@ -381,7 +382,7 @@ dissect_disp_EstablishParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int of static const ber_sequence_t SET_OF_SupplierAndConsumers_set_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_secondaryShadows_item }, + { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_modifiedSecondaryShadows_item }, }; static int @@ -507,8 +508,8 @@ static const value_string disp_ClassAttributes_vals[] = { static const ber_choice_t ClassAttributes_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_allAttributes }, - { 1, BER_CLASS_CON, 0, 0, dissect_include_impl }, - { 2, BER_CLASS_CON, 1, 0, dissect_exclude_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_include_impl }, + { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_exclude_impl }, { 0, 0, 0, 0, NULL } }; @@ -814,8 +815,8 @@ static const value_string disp_UpdateMode_vals[] = { }; static const ber_choice_t UpdateMode_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_supplierInitiated_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_consumerInitiated_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_supplierInitiated_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_consumerInitiated_impl }, { 0, 0, 0, 0, NULL } }; @@ -967,7 +968,7 @@ static const value_string disp_CoordinateShadowUpdateArgument_vals[] = { }; static const ber_choice_t CoordinateShadowUpdateArgument_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_unsignedCoordinateShadowUpdateArgument_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedCoordinateShadowUpdateArgument_impl }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCoordinateShadowUpdateArgument }, { 0, 0, 0, 0, NULL } }; @@ -1049,7 +1050,7 @@ static const value_string disp_Information_vals[] = { }; static const ber_choice_t Information_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_unsignedInformation_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedInformation_impl }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedInformation }, { 0, 0, 0, 0, NULL } }; @@ -1202,7 +1203,7 @@ static const value_string disp_RequestShadowUpdateArgument_vals[] = { }; static const ber_choice_t RequestShadowUpdateArgument_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_unsignedRequestShadowUpdateArgument_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedRequestShadowUpdateArgument_impl }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedRequestShadowUpdateArgument }, { 0, 0, 0, 0, NULL } }; @@ -1436,8 +1437,8 @@ static const value_string disp_T_attributeChanges_vals[] = { }; static const ber_choice_t T_attributeChanges_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_replace_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_changes_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_replace_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_changes_impl }, { 0, 0, 0, 0, NULL } }; @@ -1484,9 +1485,9 @@ static const value_string disp_T_sDSEChanges_vals[] = { }; static const ber_choice_t T_sDSEChanges_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_add_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_add_impl }, { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_remove }, - { 2, BER_CLASS_CON, 1, 0, dissect_modify_impl }, + { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_modify_impl }, { 0, 0, 0, 0, NULL } }; @@ -1578,8 +1579,8 @@ static const value_string disp_RefreshInformation_vals[] = { static const ber_choice_t RefreshInformation_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_noRefresh }, - { 1, BER_CLASS_CON, 0, 0, dissect_total_impl }, - { 2, BER_CLASS_CON, 1, 0, dissect_incremental_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_total_impl }, + { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_incremental_impl }, { 3, BER_CLASS_UNI, 8, BER_FLAGS_NOOWNTAG, dissect_otherStrategy }, { 0, 0, 0, 0, NULL } }; @@ -1657,7 +1658,7 @@ static const value_string disp_UpdateShadowArgument_vals[] = { }; static const ber_choice_t UpdateShadowArgument_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_unsignedUpdateShadowArgument_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unsignedUpdateShadowArgument_impl }, { 1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedUpdateShadowArgument }, { 0, 0, 0, 0, NULL } }; @@ -1794,7 +1795,7 @@ static const value_string disp_ShadowError_vals[] = { static const ber_choice_t ShadowError_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_unsignedShadowError }, - { 1, BER_CLASS_CON, 0, 0, dissect_signedShadowError_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_signedShadowError_impl }, { 0, 0, 0, 0, NULL } }; @@ -1821,7 +1822,7 @@ static void dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb, packet_info *pinfo /*--- End of included file: packet-disp-fn.c ---*/ -#line 79 "packet-disp-template.c" +#line 80 "packet-disp-template.c" /* * Dissect DISP PDUs inside a ROS PDUs @@ -1966,7 +1967,7 @@ void proto_register_disp(void) { { "secondaryShadows", "disp.secondaryShadows", FT_UINT32, BASE_DEC, NULL, 0, "ModificationParameter/secondaryShadows", HFILL }}, - { &hf_disp_secondaryShadows_item, + { &hf_disp_modifiedSecondaryShadows_item, { "Item", "disp.secondaryShadows_item", FT_NONE, BASE_NONE, NULL, 0, "ModificationParameter/secondaryShadows/_item", HFILL }}, @@ -2380,7 +2381,7 @@ void proto_register_disp(void) { "ShadowError/signedShadowError/shadowError", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 205 "packet-disp-template.c" +#line 206 "packet-disp-template.c" }; /* List of subtrees */ @@ -2445,7 +2446,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 211 "packet-disp-template.c" +#line 212 "packet-disp-template.c" }; module_t *disp_module; @@ -2488,14 +2489,14 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 243 "packet-disp-template.c" +#line 244 "packet-disp-template.c" /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.4", "id-ac-shadow-consumer-initiated"); - register_ber_oid_name("2.5.3.5", "id-ac-shadow-supplier-initiated"); - register_ber_oid_name("2.5.3.6", "id-ac-reliable-shadow-consumer-initiated"); - register_ber_oid_name("2.5.3.7", "id-ac-reliable-shadow-supplier-initiated"); + add_oid_str_name("2.5.3.4", "id-ac-shadow-consumer-initiated"); + add_oid_str_name("2.5.3.5", "id-ac-shadow-supplier-initiated"); + add_oid_str_name("2.5.3.6", "id-ac-reliable-shadow-consumer-initiated"); + add_oid_str_name("2.5.3.7", "id-ac-reliable-shadow-supplier-initiated"); /* ABSTRACT SYNTAXES */ @@ -2508,7 +2509,7 @@ void proto_reg_handoff_disp(void) { } /* OPERATIONAL BINDING */ - register_ber_oid_name("2.5.1.0.5.1", "id-op-binding-shadow"); + add_oid_str_name("2.5.1.0.5.1", "id-op-binding-shadow"); tpkt_handle = find_dissector("tpkt"); diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index bd81e7217c..67320d3b5b 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -268,7 +269,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; /*--- End of included file: packet-dop-hf.c ---*/ -#line 70 "packet-dop-template.c" +#line 71 "packet-dop-template.c" /* Initialize the subtree pointers */ static gint ett_dop = -1; @@ -344,7 +345,7 @@ static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; /*--- End of included file: packet-dop-ett.c ---*/ -#line 74 "packet-dop-template.c" +#line 75 "packet-dop-template.c" /*--- Included file: packet-dop-fn.c ---*/ @@ -692,7 +693,7 @@ dissect_dop_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs if(check_col(pinfo->cinfo, COL_INFO)) { - name = get_ber_oid_name(binding_type); + name = get_oid_str_name(binding_type); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name ? name : binding_type); } @@ -2385,7 +2386,7 @@ static void dissect_ACIItem_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /*--- End of included file: packet-dop-fn.c ---*/ -#line 76 "packet-dop-template.c" +#line 77 "packet-dop-template.c" static int call_dop_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *col_info) @@ -3285,7 +3286,7 @@ void proto_register_dop(void) { "", HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 219 "packet-dop-template.c" +#line 220 "packet-dop-template.c" }; /* List of subtrees */ @@ -3363,7 +3364,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 225 "packet-dop-template.c" +#line 226 "packet-dop-template.c" }; module_t *dop_module; @@ -3421,10 +3422,10 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 260 "packet-dop-template.c" +#line 261 "packet-dop-template.c" /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.3", "id-ac-directory-operational-binding-management"); + add_oid_str_name("2.5.3.3", "id-ac-directory-operational-binding-management"); /* ABSTRACT SYNTAXES */ @@ -3435,26 +3436,26 @@ void proto_reg_handoff_dop(void) { /* BINDING TYPES */ - register_ber_oid_name("2.5.19.1", "shadow-agreement"); - register_ber_oid_name("2.5.19.2", "hierarchical-agreement"); - register_ber_oid_name("2.5.19.3", "non-specific-hierarchical-agreement"); + add_oid_str_name("2.5.19.1", "shadow-agreement"); + add_oid_str_name("2.5.19.2", "hierarchical-agreement"); + add_oid_str_name("2.5.19.3", "non-specific-hierarchical-agreement"); /* ACCESS CONTROL SCHEMES */ - register_ber_oid_name("2.5.28.1", "basic-ACS"); - register_ber_oid_name("2.5.28.2", "simplified-ACS"); - register_ber_oid_name("2.5.28.3", "ruleBased-ACS"); - register_ber_oid_name("2.5.28.4", "ruleAndBasic-ACS"); - register_ber_oid_name("2.5.28.5", "ruleAndSimple-ACS"); + add_oid_str_name("2.5.28.1", "basic-ACS"); + add_oid_str_name("2.5.28.2", "simplified-ACS"); + add_oid_str_name("2.5.28.3", "ruleBased-ACS"); + add_oid_str_name("2.5.28.4", "ruleAndBasic-ACS"); + add_oid_str_name("2.5.28.5", "ruleAndSimple-ACS"); /* ADMINISTRATIVE ROLES */ - register_ber_oid_name("2.5.23.1", "id-ar-autonomousArea"); - register_ber_oid_name("2.5.23.2", "id-ar-accessControlSpecificArea"); - register_ber_oid_name("2.5.23.3", "id-ar-accessControlInnerArea"); - register_ber_oid_name("2.5.23.4", "id-ar-subschemaAdminSpecificArea"); - register_ber_oid_name("2.5.23.5", "id-ar-collectiveAttributeSpecificArea"); - register_ber_oid_name("2.5.23.6", "id-ar-collectiveAttributeInnerArea"); - register_ber_oid_name("2.5.23.7", "id-ar-contextDefaultSpecificArea"); - register_ber_oid_name("2.5.23.8", "id-ar-serviceSpecificArea"); + add_oid_str_name("2.5.23.1", "id-ar-autonomousArea"); + add_oid_str_name("2.5.23.2", "id-ar-accessControlSpecificArea"); + add_oid_str_name("2.5.23.3", "id-ar-accessControlInnerArea"); + add_oid_str_name("2.5.23.4", "id-ar-subschemaAdminSpecificArea"); + add_oid_str_name("2.5.23.5", "id-ar-collectiveAttributeSpecificArea"); + add_oid_str_name("2.5.23.6", "id-ar-collectiveAttributeInnerArea"); + add_oid_str_name("2.5.23.7", "id-ar-contextDefaultSpecificArea"); + add_oid_str_name("2.5.23.8", "id-ar-serviceSpecificArea"); /* remember the tpkt handler for change in preferences */ tpkt_handle = find_dissector("tpkt"); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index e2e2ac0069..251b5b39c4 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -204,7 +205,7 @@ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ /*--- End of included file: packet-dsp-hf.c ---*/ -#line 66 "packet-dsp-template.c" +#line 67 "packet-dsp-template.c" /* Initialize the subtree pointers */ static gint ett_dsp = -1; @@ -283,7 +284,7 @@ static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; /*--- End of included file: packet-dsp-ett.c ---*/ -#line 70 "packet-dsp-template.c" +#line 71 "packet-dsp-template.c" /*--- Included file: packet-dsp-fn.c ---*/ @@ -2104,7 +2105,7 @@ static void dissect_MasterAndShadowAccessPoints_PDU(tvbuff_t *tvb, packet_info * /*--- End of included file: packet-dsp-fn.c ---*/ -#line 72 "packet-dsp-template.c" +#line 73 "packet-dsp-template.c" /* * Dissect X518 PDUs inside a ROS PDUs @@ -2831,7 +2832,7 @@ void proto_register_dsp(void) { "AuthenticationLevel/other", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 278 "packet-dsp-template.c" +#line 279 "packet-dsp-template.c" }; /* List of subtrees */ @@ -2912,7 +2913,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 284 "packet-dsp-template.c" +#line 285 "packet-dsp-template.c" }; module_t *dsp_module; @@ -2959,11 +2960,11 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 321 "packet-dsp-template.c" +#line 322 "packet-dsp-template.c" /* APPLICATION CONTEXT */ - register_ber_oid_name("2.5.3.2", "id-ac-directory-system"); + add_oid_str_name("2.5.3.2", "id-ac-directory-system"); /* ABSTRACT SYNTAXES */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 17a8f3dee2..4faca06cfd 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -136,7 +137,7 @@ static int hf_ftam_attribute_extension_names = -1; /* Attribute_Extension_Names static int hf_ftam_read_attributes = -1; /* Read_Attributes */ static int hf_ftam_attributes = -1; /* Change_Attributes */ static int hf_ftam_processing_mode = -1; /* T_processing_mode */ -static int hf_ftam_open_contents_type = -1; /* T_contents_type */ +static int hf_ftam_open_contents_type = -1; /* T_open_contents_type */ static int hf_ftam_unknown = -1; /* NULL */ static int hf_ftam_proposed = -1; /* Contents_Type_Attribute */ static int hf_ftam_enable_fadu_locking = -1; /* BOOLEAN */ @@ -245,7 +246,7 @@ static int hf_ftam_object_size = -1; /* Object_Size_Attribute */ static int hf_ftam_path_access_control = -1; /* Access_Control_Attribute */ static int hf_ftam_no_value_available = -1; /* NULL */ static int hf_ftam_actual_values3 = -1; /* SET_OF_Access_Control_Element */ -static int hf_ftam_actual_values_item = -1; /* Access_Control_Element */ +static int hf_ftam_actual_values3_item = -1; /* Access_Control_Element */ static int hf_ftam_actual_values1 = -1; /* T_actual_values1 */ static int hf_ftam_insert_values = -1; /* SET_OF_Access_Control_Element */ static int hf_ftam_insert_values_item = -1; /* Access_Control_Element */ @@ -270,7 +271,7 @@ static int hf_ftam_parameter = -1; /* T_parameter */ static int hf_ftam_constraint_set_and_abstract_Syntax = -1; /* T_constraint_set_and_abstract_Syntax */ static int hf_ftam_constraint_set_name = -1; /* Constraint_Set_Name */ static int hf_ftam_actual_values5 = -1; /* GeneralizedTime */ -static int hf_ftam_actual_values8 = -1; /* T_actual_values */ +static int hf_ftam_actual_values8 = -1; /* T_actual_values8 */ static int hf_ftam_incomplete_pathname = -1; /* Pathname */ static int hf_ftam_complete_pathname = -1; /* Pathname */ static int hf_ftam_actual_values7 = -1; /* INTEGER */ @@ -385,7 +386,7 @@ static int hf_ftam_abstract_Syntax_Pattern = -1; /* Object_Identifier_Pattern * static int hf_ftam_Attribute_Extensions_Pattern_item = -1; /* Attribute_Extensions_Pattern_item */ static int hf_ftam_extension_set_attribute_Patterns = -1; /* T_extension_set_attribute_Patterns */ static int hf_ftam_extension_set_attribute_Patterns_item = -1; /* T_extension_set_attribute_Patterns_item */ -static int hf_ftam_attribute_extension_attribute_identifier = -1; /* T_extension_attribute_identifier1 */ +static int hf_ftam_attribute_extension_attribute_identifier = -1; /* T_attribute_extension_attribute_identifier */ static int hf_ftam_extension_attribute_Pattern = -1; /* T_extension_attribute_Pattern */ static int hf_ftam_Objects_Attributes_List_item = -1; /* Read_Attributes */ static int hf_ftam_success_Object_count = -1; /* INTEGER */ @@ -485,7 +486,7 @@ static int hf_ftam_Attribute_Names_read_legal_qualifiCatiOnS = -1; static int hf_ftam_Attribute_Names_read_private_use = -1; /*--- End of included file: packet-ftam-hf.c ---*/ -#line 58 "packet-ftam-template.c" +#line 59 "packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; @@ -521,7 +522,7 @@ static gint ett_ftam_F_CHANGE_ATTRIB_request = -1; static gint ett_ftam_F_CHANGE_ATTRIB_response = -1; static gint ett_ftam_F_OPEN_request = -1; static gint ett_ftam_T_processing_mode = -1; -static gint ett_ftam_T_contents_type = -1; +static gint ett_ftam_T_open_contents_type = -1; static gint ett_ftam_SET_OF_Abstract_Syntax_Name = -1; static gint ett_ftam_F_OPEN_response = -1; static gint ett_ftam_F_CLOSE_request = -1; @@ -659,7 +660,7 @@ static gint ett_ftam_AE_title = -1; static gint ett_ftam_Attribute_Value_Assertions = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 62 "packet-ftam-template.c" +#line 63 "packet-ftam-template.c" /*--- Included file: packet-ftam-fn.c ---*/ @@ -2396,7 +2397,7 @@ static int dissect_storage_account(packet_info *pinfo, proto_tree *tree, tvbuff_ } -static const value_string ftam_T_actual_values_vals[] = { +static const value_string ftam_T_actual_values8_vals[] = { { 0, "immediate-availability" }, { 1, "deferred-availability" }, { 0, NULL } @@ -2404,14 +2405,14 @@ static const value_string ftam_T_actual_values_vals[] = { static int -dissect_ftam_T_actual_values(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_ftam_T_actual_values8(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); return offset; } static int dissect_actual_values8_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ftam_T_actual_values(TRUE, tvb, offset, pinfo, tree, hf_ftam_actual_values8); + return dissect_ftam_T_actual_values8(TRUE, tvb, offset, pinfo, tree, hf_ftam_actual_values8); } @@ -2606,8 +2607,8 @@ dissect_ftam_Access_Control_Element(gboolean implicit_tag _U_, tvbuff_t *tvb, in return offset; } -static int dissect_actual_values_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ftam_Access_Control_Element(FALSE, tvb, offset, pinfo, tree, hf_ftam_actual_values_item); +static int dissect_actual_values3_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_ftam_Access_Control_Element(FALSE, tvb, offset, pinfo, tree, hf_ftam_actual_values3_item); } static int dissect_insert_values_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_ftam_Access_Control_Element(FALSE, tvb, offset, pinfo, tree, hf_ftam_insert_values_item); @@ -2618,7 +2619,7 @@ static int dissect_delete_values_item(packet_info *pinfo, proto_tree *tree, tvbu static const ber_sequence_t SET_OF_Access_Control_Element_set_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actual_values_item }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_actual_values3_item }, }; static int @@ -3402,28 +3403,28 @@ static int dissect_processing_mode_impl(packet_info *pinfo, proto_tree *tree, tv } -static const value_string ftam_T_contents_type_vals[] = { +static const value_string ftam_T_open_contents_type_vals[] = { { 0, "unknown" }, { 1, "proposed" }, { 0, NULL } }; -static const ber_choice_t T_contents_type_choice[] = { +static const ber_choice_t T_open_contents_type_choice[] = { { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_unknown_impl }, { 1, BER_CLASS_CON, 1, 0, dissect_proposed }, { 0, 0, 0, 0, NULL } }; static int -dissect_ftam_T_contents_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_ftam_T_open_contents_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_choice(pinfo, tree, tvb, offset, - T_contents_type_choice, hf_index, ett_ftam_T_contents_type, + T_open_contents_type_choice, hf_index, ett_ftam_T_open_contents_type, NULL); return offset; } static int dissect_open_contents_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ftam_T_contents_type(FALSE, tvb, offset, pinfo, tree, hf_ftam_open_contents_type); + return dissect_ftam_T_open_contents_type(FALSE, tvb, offset, pinfo, tree, hf_ftam_open_contents_type); } @@ -4878,13 +4879,13 @@ static int dissect_object_availabiiity_Pattern_impl(packet_info *pinfo, proto_tr static int -dissect_ftam_T_extension_attribute_identifier1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +dissect_ftam_T_attribute_extension_attribute_identifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); return offset; } static int dissect_attribute_extension_attribute_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_ftam_T_extension_attribute_identifier1(FALSE, tvb, offset, pinfo, tree, hf_ftam_attribute_extension_attribute_identifier); + return dissect_ftam_T_attribute_extension_attribute_identifier(FALSE, tvb, offset, pinfo, tree, hf_ftam_attribute_extension_attribute_identifier); } @@ -6081,7 +6082,7 @@ dissect_ftam_Other_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, /*--- End of included file: packet-ftam-fn.c ---*/ -#line 64 "packet-ftam-template.c" +#line 65 "packet-ftam-template.c" /* * Dissect FTAM PDUs inside a PPDU. @@ -6410,7 +6411,7 @@ void proto_register_ftam(void) { "F-OPEN-request/processing-mode", HFILL }}, { &hf_ftam_open_contents_type, { "contents-type", "ftam.contents_type", - FT_UINT32, BASE_DEC, VALS(ftam_T_contents_type_vals), 0, + FT_UINT32, BASE_DEC, VALS(ftam_T_open_contents_type_vals), 0, "F-OPEN-request/contents-type", HFILL }}, { &hf_ftam_unknown, { "unknown", "ftam.unknown", @@ -6844,7 +6845,7 @@ void proto_register_ftam(void) { { "actual-values", "ftam.actual_values", FT_UINT32, BASE_DEC, NULL, 0, "Access-Control-Attribute/actual-values", HFILL }}, - { &hf_ftam_actual_values_item, + { &hf_ftam_actual_values3_item, { "Item", "ftam.actual_values_item", FT_NONE, BASE_NONE, NULL, 0, "Access-Control-Attribute/actual-values/_item", HFILL }}, @@ -6946,7 +6947,7 @@ void proto_register_ftam(void) { "Date-and-Time-Attribute/actual-values", HFILL }}, { &hf_ftam_actual_values8, { "actual-values", "ftam.actual_values", - FT_INT32, BASE_DEC, VALS(ftam_T_actual_values_vals), 0, + FT_INT32, BASE_DEC, VALS(ftam_T_actual_values8_vals), 0, "Object-Availability-Attribute/actual-values", HFILL }}, { &hf_ftam_incomplete_pathname, { "incomplete-pathname", "ftam.incomplete_pathname", @@ -7794,7 +7795,7 @@ void proto_register_ftam(void) { "", HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 104 "packet-ftam-template.c" +#line 105 "packet-ftam-template.c" }; /* List of subtrees */ @@ -7832,7 +7833,7 @@ void proto_register_ftam(void) { &ett_ftam_F_CHANGE_ATTRIB_response, &ett_ftam_F_OPEN_request, &ett_ftam_T_processing_mode, - &ett_ftam_T_contents_type, + &ett_ftam_T_open_contents_type, &ett_ftam_SET_OF_Abstract_Syntax_Name, &ett_ftam_F_OPEN_response, &ett_ftam_F_CLOSE_request, @@ -7970,7 +7971,7 @@ void proto_register_ftam(void) { &ett_ftam_Attribute_Value_Assertions, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 110 "packet-ftam-template.c" +#line 111 "packet-ftam-template.c" }; /* Register protocol */ @@ -7990,22 +7991,22 @@ void proto_reg_handoff_ftam(void) { 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_name("1.0.8571.5.1","ISO FTAM unstructured text"); - register_ber_oid_name("1.0.8571.5.2","ISO FTAM sequential text"); - register_ber_oid_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); - register_ber_oid_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); - register_ber_oid_name("1.0.8571.2.5","FTAM simple-hierarchy"); - register_ber_oid_name("1.0.8571.3.1","FTAM hierarchical file model"); - register_ber_oid_name("1.0.8571.4.1","FTAM unstructured constraint set"); + add_oid_str_name("1.0.8571.5.1","ISO FTAM unstructured text"); + add_oid_str_name("1.0.8571.5.2","ISO FTAM sequential text"); + add_oid_str_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); + add_oid_str_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); + add_oid_str_name("1.0.8571.2.5","FTAM simple-hierarchy"); + add_oid_str_name("1.0.8571.3.1","FTAM hierarchical file model"); + add_oid_str_name("1.0.8571.4.1","FTAM unstructured constraint set"); /* Unstructured text file document type FTAM-3 */ - register_ber_oid_name("1.0.8571.5.3","ISO FTAM unstructured binary"); - register_ber_oid_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); + add_oid_str_name("1.0.8571.5.3","ISO FTAM unstructured binary"); + add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); /* Filedirectory file document type NBS-9 */ - register_ber_oid_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); + add_oid_str_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); /* Filedirectory file document type NBS-9 (WITH OLD NIST OIDs)*/ - register_ber_oid_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file"); - register_ber_oid_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax"); + add_oid_str_name("1.3.9999.1.5.9","NBS-9-OLD FTAM file directory file"); + add_oid_str_name("1.3.9999.1.2.2","NIST file directory entry abstract syntax"); } diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 045d5548ae..2d9a379859 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -964,7 +965,7 @@ static int hf_gsm_map_SupportedGADShapes_ellipsoidPointWithAltitudeAndUncertaint static int hf_gsm_map_SupportedGADShapes_ellipsoidArc = -1; /*--- End of included file: packet-gsm_map-hf.c ---*/ -#line 136 "packet-gsm_map-template.c" +#line 137 "packet-gsm_map-template.c" /* Initialize the subtree pointers */ static gint ett_gsm_map = -1; @@ -1383,7 +1384,7 @@ static gint ett_gsm_map_ExtensionContainer = -1; static gint ett_gsm_map_AccessTypePriv = -1; /*--- End of included file: packet-gsm_map-ett.c ---*/ -#line 154 "packet-gsm_map-template.c" +#line 155 "packet-gsm_map-template.c" static dissector_table_t sms_dissector_table; /* SMS TPDU */ static dissector_handle_t data_handle; @@ -14736,7 +14737,7 @@ static void dissect_Component_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree /*--- End of included file: packet-gsm_map-fn.c ---*/ -#line 562 "packet-gsm_map-template.c" +#line 563 "packet-gsm_map-template.c" const value_string gsm_map_opr_code_strings[] = { { 2, "updateLocation" }, @@ -19656,7 +19657,7 @@ void proto_register_gsm_map(void) { "", HFILL }}, /*--- End of included file: packet-gsm_map-hfarr.c ---*/ -#line 2205 "packet-gsm_map-template.c" +#line 2206 "packet-gsm_map-template.c" }; /* List of subtrees */ @@ -20077,7 +20078,7 @@ void proto_register_gsm_map(void) { &ett_gsm_map_AccessTypePriv, /*--- End of included file: packet-gsm_map-ettarr.c ---*/ -#line 2225 "packet-gsm_map-template.c" +#line 2226 "packet-gsm_map-template.c" }; /* Register protocol */ @@ -20094,9 +20095,9 @@ void proto_register_gsm_map(void) { gsm_map_tap = register_tap("gsm_map"); /* #include "packet-gsm_map-dis-tab.c" */ - register_ber_oid_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" ); - register_ber_oid_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" ); - /*register_ber_oid_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" ); + add_oid_str_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" ); + add_oid_str_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" ); + /*add_oid_str_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" ); * * Register our configuration options, particularly our ssn:s * Set default SSNs diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 0ed70a1ad7..727d352957 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ldap.c */ +/* .\packet-ldap.c */ /* ../../tools/asn2wrs.py -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.c */ @@ -406,7 +406,7 @@ static char *assertionvalue_string=NULL; * display it as a string, othervise just display it in hex. */ static int -dissect_ldap_AssertionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) +dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { gint8 class; gboolean pc, ind, is_ascii; @@ -918,8 +918,8 @@ static const value_string ldap_AuthenticationChoice_vals[] = { }; static const ber_choice_t AuthenticationChoice_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_simple_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_sasl_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_simple_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_sasl_impl }, { 0, 0, 0, 0, NULL } }; @@ -1511,9 +1511,9 @@ static const value_string ldap_T_substringFilter_substrings_item_vals[] = { }; static const ber_choice_t T_substringFilter_substrings_item_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_initial_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_any_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_final_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_initial_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_any_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_final_impl }, { 0, 0, 0, 0, NULL } }; @@ -1703,16 +1703,16 @@ static const value_string ldap_Filter_vals[] = { }; static const ber_choice_t Filter_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_and_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_or_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_not_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_equalityMatch_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_substrings_impl }, - { 5, BER_CLASS_CON, 5, 0, dissect_greaterOrEqual_impl }, - { 6, BER_CLASS_CON, 6, 0, dissect_lessOrEqual_impl }, - { 7, BER_CLASS_CON, 7, 0, dissect_present_impl }, - { 8, BER_CLASS_CON, 8, 0, dissect_approxMatch_impl }, - { 9, BER_CLASS_CON, 9, 0, dissect_extensibleMatch_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_and_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_or_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_not_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_equalityMatch_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_substrings_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_greaterOrEqual_impl }, + { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_lessOrEqual_impl }, + { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_present_impl }, + { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_approxMatch_impl }, + { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_extensibleMatch_impl }, { 0, 0, 0, 0, NULL } }; @@ -2651,7 +2651,7 @@ static void dissect_LDAPMessage_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tre /*--- End of included file: packet-ldap-fn.c ---*/ -#line 465 "packet-ldap-template.c" +#line 469 "packet-ldap-template.c" static void dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo, @@ -3937,7 +3937,7 @@ void proto_register_ldap(void) { "ExtendedResponse/response", HFILL }}, /*--- End of included file: packet-ldap-hfarr.c ---*/ -#line 1358 "packet-ldap-template.c" +#line 1362 "packet-ldap-template.c" }; /* List of subtrees */ @@ -3990,7 +3990,7 @@ void proto_register_ldap(void) { &ett_ldap_ExtendedResponse, /*--- End of included file: packet-ldap-ettarr.c ---*/ -#line 1369 "packet-ldap-template.c" +#line 1373 "packet-ldap-template.c" }; module_t *ldap_module; @@ -4045,26 +4045,26 @@ proto_reg_handoff_ldap(void) gssapi_wrap_handle = find_dissector("gssapi_verf"); /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */ - register_ber_oid_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING"); - register_ber_oid_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID"); - register_ber_oid_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID"); - register_ber_oid_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID"); - register_ber_oid_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID"); - register_ber_oid_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID"); - register_ber_oid_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID"); - register_ber_oid_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID"); - register_ber_oid_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID"); - register_ber_oid_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID"); - register_ber_oid_name("1.2.840.113556.1.4.970 ","None"); - register_ber_oid_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID"); - register_ber_oid_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID"); - register_ber_oid_name("1.3.6.1.4.1.1466.101.119.1","None"); - register_ber_oid_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID"); - register_ber_oid_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV"); + add_oid_str_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING"); + add_oid_str_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID"); + add_oid_str_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID"); + add_oid_str_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID"); + add_oid_str_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID"); + add_oid_str_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID"); + add_oid_str_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID"); + add_oid_str_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID"); + add_oid_str_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID"); + add_oid_str_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID"); + add_oid_str_name("1.2.840.113556.1.4.970 ","None"); + add_oid_str_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID"); + add_oid_str_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID"); + add_oid_str_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID"); + add_oid_str_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID"); + add_oid_str_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID"); + add_oid_str_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID"); + add_oid_str_name("1.3.6.1.4.1.1466.101.119.1","None"); + add_oid_str_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID"); + add_oid_str_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV"); register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap); diff --git a/epan/dissectors/packet-ldap.h b/epan/dissectors/packet-ldap.h index 93cdd7638d..da424bbacd 100644 --- a/epan/dissectors/packet-ldap.h +++ b/epan/dissectors/packet-ldap.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ldap.h */ +/* .\packet-ldap.h */ /* ../../tools/asn2wrs.py -b -e -p ldap -c ldap.cnf -s packet-ldap-template Lightweight-Directory-Access-Protocol-V3.asn */ /* Input file: packet-ldap-template.h */ diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index b4cb4fb250..3c932cd7c5 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -77,7 +77,7 @@ typedef int (*per_type_fn)(tvbuff_t*, int, asn_ctx_t*, proto_tree*, int); typedef struct _per_choice_t { int value; - const char *name; + const char *name_to_remove; int extension; per_callback func; } per_choice_t; diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index ab9e5fa70f..a4af984767 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -60,7 +61,7 @@ static int hf_pkixproxy_policyLanguage = -1; /* OBJECT_IDENTIFIER */ static int hf_pkixproxy_policy = -1; /* OCTET_STRING */ /*--- End of included file: packet-pkixproxy-hf.c ---*/ -#line 46 "packet-pkixproxy-template.c" +#line 47 "packet-pkixproxy-template.c" /* Initialize the subtree pointers */ @@ -70,7 +71,7 @@ static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; /*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 49 "packet-pkixproxy-template.c" +#line 50 "packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ @@ -157,7 +158,7 @@ static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb, packet_info *pinfo /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 51 "packet-pkixproxy-template.c" +#line 52 "packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -190,7 +191,7 @@ void proto_register_pkixproxy(void) { "ProxyPolicy/policy", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 59 "packet-pkixproxy-template.c" +#line 60 "packet-pkixproxy-template.c" }; /* List of subtrees */ @@ -202,7 +203,7 @@ void proto_register_pkixproxy(void) { &ett_pkixproxy_ProxyPolicy, /*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 64 "packet-pkixproxy-template.c" +#line 65 "packet-pkixproxy-template.c" }; /* Register protocol */ @@ -224,9 +225,9 @@ void proto_reg_handoff_pkixproxy(void) { /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 79 "packet-pkixproxy-template.c" - register_ber_oid_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage"); - register_ber_oid_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll"); - register_ber_oid_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent"); +#line 80 "packet-pkixproxy-template.c" + add_oid_str_name("1.3.6.1.5.5.7.21.0", "id-ppl-anyLanguage"); + add_oid_str_name("1.3.6.1.5.5.7.21.1", "id-ppl-inheritAll"); + add_oid_str_name("1.3.6.1.5.5.7.21.2", "id-ppl-independent"); } diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index fd2af30466..6fc2be4c17 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -185,7 +186,7 @@ static int hf_tcap_T_protocol_versionre_version1 = -1; static int hf_tcap_T_protocol_version3_version1 = -1; /*--- End of included file: packet-tcap-hf.c ---*/ -#line 53 "packet-tcap-template.c" +#line 54 "packet-tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -250,7 +251,7 @@ static gint ett_tcap_OperationCode = -1; static gint ett_tcap_ErrorCode = -1; /*--- End of included file: packet-tcap-ett.c ---*/ -#line 63 "packet-tcap-template.c" +#line 64 "packet-tcap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -2310,7 +2311,7 @@ dissect_tcap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_ /*--- End of included file: packet-tcap-fn.c ---*/ -#line 115 "packet-tcap-template.c" +#line 116 "packet-tcap-template.c" @@ -2360,7 +2361,7 @@ proto_reg_handoff_tcap(void) prefs_initialized = TRUE; } - register_ber_oid_name("0.0.17.773.1.1.1", + add_oid_str_name("0.0.17.773.1.1.1", "itu-t(0) recommendation(0) q(17) 773 as(1) dialogue-as(1) version1(1)"); data_handle = find_dissector("data"); @@ -2887,7 +2888,7 @@ proto_register_tcap(void) "", HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 199 "packet-tcap-template.c" +#line 200 "packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -2951,7 +2952,7 @@ proto_register_tcap(void) &ett_tcap_ErrorCode, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 208 "packet-tcap-template.c" +#line 209 "packet-tcap-template.c" }; /*static enum_val_t tcap_options[] = { diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index e0e4e68061..214bdc05bc 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -61,7 +62,7 @@ static int hf_wlancertextn_SSIDList_PDU = -1; /* SSIDList */ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ /*--- End of included file: packet-wlancertextn-hf.c ---*/ -#line 50 "packet-wlancertextn-template.c" +#line 51 "packet-wlancertextn-template.c" /* Initialize the subtree pointers */ @@ -70,7 +71,7 @@ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ static gint ett_wlancertextn_SSIDList = -1; /*--- End of included file: packet-wlancertextn-ett.c ---*/ -#line 53 "packet-wlancertextn-template.c" +#line 54 "packet-wlancertextn-template.c" /*--- Included file: packet-wlancertextn-fn.c ---*/ @@ -112,7 +113,7 @@ static void dissect_SSIDList_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 55 "packet-wlancertextn-template.c" +#line 56 "packet-wlancertextn-template.c" /*--- proto_register_wlancertextn ----------------------------------------------*/ @@ -133,7 +134,7 @@ void proto_register_wlancertextn(void) { "SSIDList/_item", HFILL }}, /*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 63 "packet-wlancertextn-template.c" +#line 64 "packet-wlancertextn-template.c" }; /* List of subtrees */ @@ -144,7 +145,7 @@ void proto_register_wlancertextn(void) { &ett_wlancertextn_SSIDList, /*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 68 "packet-wlancertextn-template.c" +#line 69 "packet-wlancertextn-template.c" }; /* Register protocol */ @@ -167,8 +168,8 @@ void proto_reg_handoff_wlancertextn(void) { /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ -#line 83 "packet-wlancertextn-template.c" - register_ber_oid_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP"); - register_ber_oid_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN"); +#line 84 "packet-wlancertextn-template.c" + add_oid_str_name("1.3.6.1.5.5.7.3.13","id-kp-eapOverPPP"); + add_oid_str_name("1.3.6.1.5.5.7.3.14","id-kp-eapOverLAN"); } diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index e2d5aa302f..6b2b1655d0 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -537,7 +538,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1; static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1; /*--- End of included file: packet-x411-hf.c ---*/ -#line 74 "packet-x411-template.c" +#line 75 "packet-x411-template.c" /* Initialize the subtree pointers */ static gint ett_x411 = -1; @@ -716,7 +717,7 @@ static gint ett_x411_SecurityCategories = -1; static gint ett_x411_SecurityCategory = -1; /*--- End of included file: packet-x411-ett.c ---*/ -#line 78 "packet-x411-template.c" +#line 79 "packet-x411-template.c" /*--- Included file: packet-x411-fn.c ---*/ @@ -1047,8 +1048,8 @@ static const value_string x411_Credentials_vals[] = { static const ber_choice_t Credentials_choice[] = { { 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_simple }, - { 1, BER_CLASS_CON, 0, 0, dissect_strong_impl }, - { 2, BER_CLASS_CON, 1, 0, dissect_protected_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_strong_impl }, + { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_protected_impl }, { 0, 0, 0, 0, NULL } }; @@ -1280,7 +1281,7 @@ static const value_string x411_MTABindArgument_vals[] = { static const ber_choice_t MTABindArgument_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unauthenticated }, - { 1, BER_CLASS_CON, 1, 0, dissect_authenticated_argument_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_authenticated_argument_impl }, { 0, 0, 0, 0, NULL } }; @@ -1332,7 +1333,7 @@ static const value_string x411_MTABindResult_vals[] = { static const ber_choice_t MTABindResult_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_unauthenticated }, - { 1, BER_CLASS_CON, 1, 0, dissect_authenticated_result_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_authenticated_result_impl }, { 0, 0, 0, 0, NULL } }; @@ -2363,7 +2364,7 @@ dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int o if(content_type_id) { - name = get_ber_oid_name(content_type_id); + name = get_oid_str_name(content_type_id); if(!name) name = content_type_id; @@ -2784,8 +2785,8 @@ static const value_string x411_ExtensionType_vals[] = { }; static const ber_choice_t ExtensionType_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_standard_extension_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_private_extension_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_standard_extension_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_private_extension_impl }, { 0, 0, 0, 0, NULL } }; @@ -2832,7 +2833,7 @@ dissect_x411_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset offset=call_x411_oid_callback("x411.extension", tvb, offset, pinfo, tree); else if(object_identifier_id) { call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id); } @@ -3489,8 +3490,8 @@ static const value_string x411_ReportType_vals[] = { }; static const ber_choice_t ReportType_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_delivery_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_non_delivery_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_delivery_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_non_delivery_impl }, { 0, 0, 0, 0, NULL } }; @@ -3645,9 +3646,9 @@ static const value_string x411_MTS_APDU_vals[] = { }; static const ber_choice_t MTS_APDU_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_message_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_probe_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_report_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_message_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_probe_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_report_impl }, { 0, 0, 0, 0, NULL } }; @@ -3777,8 +3778,8 @@ static const value_string x411_ObjectName_vals[] = { static const ber_choice_t ObjectName_choice[] = { { 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_user_agent }, - { 1, BER_CLASS_CON, 0, 0, dissect_mTA_impl }, - { 2, BER_CLASS_CON, 4, 0, dissect_message_store_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_mTA_impl }, + { 2, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_message_store_impl }, { 0, 0, 0, 0, NULL } }; @@ -4470,7 +4471,7 @@ static const value_string x411_DeliveredContentType_vals[] = { }; static const ber_choice_t DeliveredContentType_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_built_in_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_built_in_impl }, { 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extended }, { 0, 0, 0, 0, NULL } }; @@ -4862,7 +4863,7 @@ static const value_string x411_T_refused_argument_vals[] = { }; static const ber_choice_t T_refused_argument_choice[] = { - { 0, BER_CLASS_CON, 1, 0, dissect_built_in_argument_impl }, + { 0, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_built_in_argument_impl }, { 1, BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_refused_extension }, { 0, 0, 0, 0, NULL } }; @@ -4982,8 +4983,8 @@ static const value_string x411_UserAddress_vals[] = { }; static const ber_choice_t UserAddress_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_x121_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_presentation_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x121_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_presentation_impl }, { 0, 0, 0, 0, NULL } }; @@ -5063,8 +5064,8 @@ static const value_string x411_ExactOrPattern_vals[] = { }; static const ber_choice_t ExactOrPattern_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_exact_match_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_pattern_match_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_exact_match_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pattern_match_impl }, { 0, 0, 0, 0, NULL } }; @@ -6067,8 +6068,8 @@ static const value_string x411_T_report_type_vals[] = { }; static const ber_choice_t T_report_type_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_report_type_delivery_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_non_delivery_report_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_report_type_delivery_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_non_delivery_report_impl }, { 0, 0, 0, 0, NULL } }; @@ -6142,8 +6143,8 @@ static const value_string x411_ExtendedCertificate_vals[] = { }; static const ber_choice_t ExtendedCertificate_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_directory_entry_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_certificate_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_directory_entry_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_certificate_impl }, { 0, 0, 0, 0, NULL } }; @@ -6774,7 +6775,7 @@ static const value_string x411_ExtendedNetworkAddress_vals[] = { static const ber_choice_t ExtendedNetworkAddress_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_e163_4_address }, - { 1, BER_CLASS_CON, 0, 0, dissect_psap_address_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_psap_address_impl }, { 0, 0, 0, 0, NULL } }; @@ -6921,7 +6922,7 @@ static const value_string x411_T_name_vals[] = { static const ber_choice_t T_name_choice[] = { { 0, BER_CLASS_APP, 0, BER_FLAGS_NOOWNTAG, dissect_token_recipient_name }, - { 1, BER_CLASS_CON, 3, 0, dissect_token_mta_impl }, + { 1, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_token_mta_impl }, { 0, 0, 0, 0, NULL } }; @@ -7198,7 +7199,7 @@ static void dissect_AsymmetricToken_PDU(tvbuff_t *tvb, packet_info *pinfo, proto /*--- End of included file: packet-x411-fn.c ---*/ -#line 80 "packet-x411-template.c" +#line 81 "packet-x411-template.c" static int call_x411_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) @@ -7208,7 +7209,7 @@ call_x411_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *p sprintf(extension_oid, "%s.%d", base_oid, extension_id); - name = get_ber_oid_name(extension_oid); + name = get_oid_str_name(extension_oid); proto_item_append_text(tree, " (%s)", name ? name : extension_oid); return call_ber_oid_callback(extension_oid, tvb, offset, pinfo, tree); @@ -9142,7 +9143,7 @@ void proto_register_x411(void) { "", HFILL }}, /*--- End of included file: packet-x411-hfarr.c ---*/ -#line 207 "packet-x411-template.c" +#line 208 "packet-x411-template.c" }; /* List of subtrees */ @@ -9323,7 +9324,7 @@ void proto_register_x411(void) { &ett_x411_SecurityCategory, /*--- End of included file: packet-x411-ettarr.c ---*/ -#line 213 "packet-x411-template.c" +#line 214 "packet-x411-template.c" }; /* Register protocol */ @@ -9411,11 +9412,11 @@ void proto_reg_handoff_x411(void) { /*--- End of included file: packet-x411-dis-tab.c ---*/ -#line 230 "packet-x411-template.c" +#line 231 "packet-x411-template.c" /* APPLICATION CONTEXT */ - register_ber_oid_name("2.6.0.1.6", "id-ac-mts-transfer"); + add_oid_str_name("2.6.0.1.6", "id-ac-mts-transfer"); /* ABSTRACT SYNTAXES */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index 8463ba549f..150ed0fef2 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -651,7 +651,7 @@ dissect_x420_T_type(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id); @@ -1598,17 +1598,17 @@ static const value_string x420_BodyPart_vals[] = { }; static const ber_choice_t BodyPart_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_ia5_text_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_g3_facsimile_impl }, - { 4, BER_CLASS_CON, 4, 0, dissect_g4_class1_impl }, - { 5, BER_CLASS_CON, 5, 0, dissect_teletex_impl }, - { 6, BER_CLASS_CON, 6, 0, dissect_videotex_impl }, - { 8, BER_CLASS_CON, 8, 0, dissect_encrypted_bp_impl }, - { 9, BER_CLASS_CON, 9, 0, dissect_message_impl }, - { 11, BER_CLASS_CON, 11, 0, dissect_mixed_mode_impl }, - { 14, BER_CLASS_CON, 14, 0, dissect_bilaterally_defined_impl }, - { 7, BER_CLASS_CON, 7, 0, dissect_nationally_defined_impl }, - { 15, BER_CLASS_CON, 15, 0, dissect_extended_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ia5_text_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_g3_facsimile_impl }, + { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_g4_class1_impl }, + { 5, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_teletex_impl }, + { 6, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_videotex_impl }, + { 8, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_encrypted_bp_impl }, + { 9, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_message_impl }, + { 11, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_mixed_mode_impl }, + { 14, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_bilaterally_defined_impl }, + { 7, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_nationally_defined_impl }, + { 15, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_extended_impl }, { 0, 0, 0, 0, NULL } }; @@ -1947,9 +1947,9 @@ static const value_string x420_T_choice_vals[] = { }; static const ber_choice_t T_choice_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_non_receipt_fields_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_receipt_fields_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_other_notification_type_fields_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_non_receipt_fields_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_receipt_fields_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_other_notification_type_fields_impl }, { 0, 0, 0, 0, NULL } }; @@ -2003,8 +2003,8 @@ const value_string x420_InformationObject_vals[] = { }; static const ber_choice_t InformationObject_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_ipm_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_ipn_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_ipm_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_ipn_impl }, { 0, 0, 0, 0, NULL } }; @@ -2107,10 +2107,10 @@ static const value_string x420_BodyPartReference_vals[] = { }; static const ber_choice_t BodyPartReference_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_stored_entry_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_stored_content_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_submitted_body_part_impl }, - { 3, BER_CLASS_CON, 3, 0, dissect_stored_body_part_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_stored_entry_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_stored_content_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_submitted_body_part_impl }, + { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_stored_body_part_impl }, { 0, 0, 0, 0, NULL } }; @@ -2303,8 +2303,8 @@ static const value_string x420_BodyPartSecurityLabel_vals[] = { }; static const ber_choice_t BodyPartSecurityLabel_choice[] = { - { 0, BER_CLASS_CON, 0, 0, dissect_body_part_unlabelled_impl }, - { 1, BER_CLASS_CON, 1, 0, dissect_body_part_security_label_impl }, + { 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_body_part_unlabelled_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_body_part_security_label_impl }, { 0, 0, 0, 0, NULL } }; diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 0e4d0a6a37..bdce26e3ad 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -271,7 +271,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse if(algorithm_id) { - name = get_ber_oid_name(algorithm_id); + name = get_oid_str_name(algorithm_id); proto_item_append_text(tree, " (%s)", name ? name : algorithm_id); } @@ -494,7 +494,7 @@ dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa if(extension_id) { - name = get_ber_oid_name(extension_id); + name = get_oid_str_name(extension_id); proto_item_append_text(tree, " (%s)", name ? name : extension_id); } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 80923b84a5..74a3e34579 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -82,7 +82,7 @@ static int hf_x509if_ca_contextType = -1; /* ContextId */ static int hf_x509if_ca_contextValues = -1; /* SET_OF_ContextValue */ static int hf_x509if_ca_contextValues_item = -1; /* ContextValue */ static int hf_x509if_ata_assertedContexts = -1; /* SEQUENCE_OF_ContextAssertion */ -static int hf_x509if_assertedContexts_item = -1; /* ContextAssertion */ +static int hf_x509if_ata_assertedContexts_item = -1; /* ContextAssertion */ static int hf_x509if_rdnSequence = -1; /* RDNSequence */ static int hf_x509if_RDNSequence_item = -1; /* RDNSequence_item */ static int hf_x509if_RelativeDistinguishedName_item = -1; /* RelativeDistinguishedName_item */ @@ -381,7 +381,7 @@ dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, if(object_identifier_id) { /* see if we can find a nice name */ - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); if(!name) name = object_identifier_id; if(doing_dn) { /* append it to the RDN */ @@ -467,7 +467,7 @@ dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ - if(!(name = get_ber_oid_name(object_identifier_id))) + if(!(name = get_oid_str_name(object_identifier_id))) name = object_identifier_id; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s %s", name, fmt, value); @@ -735,8 +735,8 @@ dissect_x509if_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int of static int dissect_selectedContexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { return dissect_x509if_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedContexts_item); } -static int dissect_assertedContexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_x509if_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts_item); +static int dissect_ata_assertedContexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_x509if_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_ata_assertedContexts_item); } @@ -808,7 +808,7 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = { - { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_assertedContexts_item }, + { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts_item }, }; static int @@ -2382,7 +2382,7 @@ void proto_register_x509if(void) { { "assertedContexts", "x509if.assertedContexts", FT_UINT32, BASE_DEC, NULL, 0, "AttributeTypeAssertion/assertedContexts", HFILL }}, - { &hf_x509if_assertedContexts_item, + { &hf_x509if_ata_assertedContexts_item, { "Item", "x509if.assertedContexts_item", FT_NONE, BASE_NONE, NULL, 0, "AttributeTypeAssertion/assertedContexts/_item", HFILL }}, diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 28cf0005b5..14c40465a3 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -223,7 +224,7 @@ static int hf_x509sat_T_bitNamedDays_friday = -1; static int hf_x509sat_T_bitNamedDays_saturday = -1; /*--- End of included file: packet-x509sat-hf.c ---*/ -#line 48 "packet-x509sat-template.c" +#line 49 "packet-x509sat-template.c" /* Initialize the subtree pointers */ @@ -278,7 +279,7 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 51 "packet-x509sat-template.c" +#line 52 "packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ @@ -2026,7 +2027,7 @@ static void dissect_SyntaxGeneralString_PDU(tvbuff_t *tvb, packet_info *pinfo, p /*--- End of included file: packet-x509sat-fn.c ---*/ -#line 53 "packet-x509sat-template.c" +#line 54 "packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -2699,7 +2700,7 @@ void proto_register_x509sat(void) { "", HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 61 "packet-x509sat-template.c" +#line 62 "packet-x509sat-template.c" }; /* List of subtrees */ @@ -2756,7 +2757,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 66 "packet-x509sat-template.c" +#line 67 "packet-x509sat-template.c" }; /* Register protocol */ @@ -2899,37 +2900,37 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 81 "packet-x509sat-template.c" +#line 82 "packet-x509sat-template.c" /* OBJECT CLASSES */ - register_ber_oid_name("2.5.6.0", "top"); - register_ber_oid_name("2.5.6.1", "alias"); - register_ber_oid_name("2.5.6.2", "country"); - register_ber_oid_name("2.5.6.3", "locality"); - register_ber_oid_name("2.5.6.4", "organization"); - register_ber_oid_name("2.5.6.1", "organizationalUnit"); - register_ber_oid_name("2.5.6.6", "person"); - register_ber_oid_name("2.5.6.7", "organizationalPerson"); - register_ber_oid_name("2.5.6.8", "organizationalRole"); - register_ber_oid_name("2.5.6.9", "groupOfNames"); - register_ber_oid_name("2.5.6.10", "residentialPerson"); - register_ber_oid_name("2.5.6.11", "applicationProcess"); - register_ber_oid_name("2.5.6.12", "applicationEntity"); - register_ber_oid_name("2.5.6.13", "dSA"); - register_ber_oid_name("2.5.6.14", "device"); - register_ber_oid_name("2.5.6.15", "strongAuthenticationUser"); - register_ber_oid_name("2.5.6.16", "certificationAuthority"); - register_ber_oid_name("2.5.6.16.2", "certificationAuthorityV2"); - register_ber_oid_name("2.5.6.17", "groupOfUniqueNames"); - register_ber_oid_name("2.5.6.18", "userSecurityInformation"); - register_ber_oid_name("2.5.6.19", "cRLDistributionPoint"); - register_ber_oid_name("2.5.6.20", "dmd"); - register_ber_oid_name("2.5.6.21", "pkiUser"); - register_ber_oid_name("2.5.6.22", "pkiCA"); + add_oid_str_name("2.5.6.0", "top"); + add_oid_str_name("2.5.6.1", "alias"); + add_oid_str_name("2.5.6.2", "country"); + add_oid_str_name("2.5.6.3", "locality"); + add_oid_str_name("2.5.6.4", "organization"); + add_oid_str_name("2.5.6.1", "organizationalUnit"); + add_oid_str_name("2.5.6.6", "person"); + add_oid_str_name("2.5.6.7", "organizationalPerson"); + add_oid_str_name("2.5.6.8", "organizationalRole"); + add_oid_str_name("2.5.6.9", "groupOfNames"); + add_oid_str_name("2.5.6.10", "residentialPerson"); + add_oid_str_name("2.5.6.11", "applicationProcess"); + add_oid_str_name("2.5.6.12", "applicationEntity"); + add_oid_str_name("2.5.6.13", "dSA"); + add_oid_str_name("2.5.6.14", "device"); + add_oid_str_name("2.5.6.15", "strongAuthenticationUser"); + add_oid_str_name("2.5.6.16", "certificationAuthority"); + add_oid_str_name("2.5.6.16.2", "certificationAuthorityV2"); + add_oid_str_name("2.5.6.17", "groupOfUniqueNames"); + add_oid_str_name("2.5.6.18", "userSecurityInformation"); + add_oid_str_name("2.5.6.19", "cRLDistributionPoint"); + add_oid_str_name("2.5.6.20", "dmd"); + add_oid_str_name("2.5.6.21", "pkiUser"); + add_oid_str_name("2.5.6.22", "pkiCA"); - register_ber_oid_name("2.5.6.28", "parent"); - register_ber_oid_name("2.5.6.29", "child"); + add_oid_str_name("2.5.6.28", "parent"); + add_oid_str_name("2.5.6.29", "child"); } -- 2.34.1