From cefda4dc7b2ec4b955b7d5b6ddc2f913e684695c Mon Sep 17 00:00:00 2001 From: kukosa Date: Wed, 28 Jun 2006 14:19:08 +0000 Subject: 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/dop/dop.cnf | 2 +- asn1/dop/packet-dop-template.c | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) (limited to 'asn1/dop') 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"); -- cgit v1.2.3