diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-31 21:24:16 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-31 21:24:16 +0000 |
commit | 9ed1834d80c47b4c270d5fa75f2cae0d85949ea7 (patch) | |
tree | 7f72a3e76311caa37dfa1d299da900c6b214236c /epan/dissectors | |
parent | 2be99d15e43a4330ed8153e3904886566bbd0717 (diff) |
Use oid_add_from_string for adding names.
(gsmmap and inap does not compile at the moment).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23324 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-acp133.c | 94 | ||||
-rw-r--r-- | epan/dissectors/packet-acp133.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dap.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-dop.c | 38 | ||||
-rw-r--r-- | epan/dissectors/packet-dop.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dsp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ftam.c | 36 | ||||
-rw-r--r-- | epan/dissectors/packet-ftam.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-h225.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixproxy.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixproxy.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-wlancertextn.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-wlancertextn.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-x411.c | 4 |
14 files changed, 115 insertions, 115 deletions
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 0edbd82394..895896438f 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-acp133.c */ -/* ../../tools/asn2wrs.py -b -e -X -T -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ +/* packet-acp133.c */ +/* ../../tools/asn2wrs.py -b -X -T -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ /* Input file: packet-acp133-template.c */ @@ -1438,56 +1438,56 @@ void proto_reg_handoff_acp133(void) { #line 94 "packet-acp133-template.c" /* X.402 Object Classes */ - 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"); + oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); + oid_add_from_string("id-oc-mhs-message-store","2.6.5.1.1"); + oid_add_from_string("id-oc-mhs-message-transfer-agent","2.6.5.1.2"); + oid_add_from_string("id-oc-mhs-user","2.6.5.1.3"); /* SDN.701 Object Classes */ - 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"); + oid_add_from_string("id-oc-secure-user","2.16.840.1.101.2.1.4.13"); + oid_add_from_string("id-oc-ukms","2.16.840.1.101.2.1.4.16"); /* ACP133 Object Classes */ - 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"); + oid_add_from_string("id-oc-plaData","2.16.840.1.101.2.2.3.26"); + oid_add_from_string("id-oc-cadACP127","2.16.840.1.101.2.2.3.28"); + oid_add_from_string("id-oc-mLA","2.16.840.1.101.2.2.3.31"); + oid_add_from_string("id-oc-orgACP127","2.16.840.1.101.2.2.3.34"); + oid_add_from_string("id-oc-plaCollectiveACP127","2.16.840.1.101.2.2.3.35"); + oid_add_from_string("id-oc-routingIndicator","2.16.840.1.101.2.2.3.37"); + oid_add_from_string("id-oc-sigintPLA","2.16.840.1.101.2.2.3.38"); + oid_add_from_string("id-oc-sIPLA","2.16.840.1.101.2.2.3.39"); + oid_add_from_string("id-oc-spotPLA","2.16.840.1.101.2.2.3.40"); + oid_add_from_string("id-oc-taskForceACP127","2.16.840.1.101.2.2.3.41"); + oid_add_from_string("id-oc-tenantACP127","2.16.840.1.101.2.2.3.42"); + oid_add_from_string("id-oc-plaACP127","2.16.840.1.101.2.2.3.47"); + oid_add_from_string("id-oc-aliasCommonName","2.16.840.1.101.2.2.3.52"); + oid_add_from_string("id-oc-aliasOrganizationalUnit","2.16.840.1.101.2.2.3.53"); + oid_add_from_string("id-oc-distributionCodesHandled","2.16.840.1.101.2.2.3.54"); + oid_add_from_string("id-oc-distributionCodeDescription","2.16.840.1.101.2.2.3.55"); + oid_add_from_string("id-oc-plaUser","2.16.840.1.101.2.2.3.56"); + oid_add_from_string("id-oc-addressList","2.16.840.1.101.2.2.3.57"); + oid_add_from_string("id-oc-altSpellingACP127","2.16.840.1.101.2.2.3.58"); + oid_add_from_string("id-oc-messagingGateway","2.16.840.1.101.2.2.3.59"); + oid_add_from_string("id-oc-network","2.16.840.1.101.2.2.3.60"); + oid_add_from_string("id-oc-networkInstructions","2.16.840.1.101.2.2.3.61"); + oid_add_from_string("id-oc-otherContactInformation","2.16.840.1.101.2.2.3.62"); + oid_add_from_string("id-oc-releaseAuthorityPerson","2.16.840.1.101.2.2.3.63"); + oid_add_from_string("id-oc-mLAgent","2.16.840.1.101.2.2.3.64"); + oid_add_from_string("id-oc-releaseAuthorityPersonA","2.16.840.1.101.2.2.3.65"); + oid_add_from_string("id-oc-securePkiUser","2.16.840.1.101.2.2.3.66"); + oid_add_from_string("id-oc-dSSCSPLA","2.16.840.1.101.2.2.3.67"); + oid_add_from_string("id-oc-aCPNetworkEdB","2.16.840.1.101.2.2.3.68"); + oid_add_from_string("id-oc-aCPNetworkInstructionsEdB","2.16.840.1.101.2.2.3.69"); /* gateway types */ - 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"); + oid_add_from_string("acp120-acp127","2.16.840.1.101.2.2.5.0"); + oid_add_from_string("acp120-janap128","2.16.840.1.101.2.2.5.1"); + oid_add_from_string("acp120-mhs","2.16.840.1.101.2.2.5.2"); + oid_add_from_string("acp120-mmhs","2.16.840.1.101.2.2.5.3"); + oid_add_from_string("acp120-rfc822","2.16.840.1.101.2.2.5.4"); + oid_add_from_string("boundaryMTA","2.16.840.1.101.2.2.5.5"); + oid_add_from_string("mmhs-mhs","2.16.840.1.101.2.2.5.6"); + oid_add_from_string("mmhs-rfc822","2.16.840.1.101.2.2.5.7"); + oid_add_from_string("mta-acp127","2.16.840.1.101.2.2.5.8"); } diff --git a/epan/dissectors/packet-acp133.h b/epan/dissectors/packet-acp133.h index 4310014663..3f11b69746 100644 --- a/epan/dissectors/packet-acp133.h +++ b/epan/dissectors/packet-acp133.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-acp133.h */ -/* ../../tools/asn2wrs.py -b -e -X -T -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ +/* packet-acp133.h */ +/* ../../tools/asn2wrs.py -b -X -T -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn */ /* Input file: packet-acp133-template.h */ diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index d30dd6dcca..d28200f4ef 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -1987,7 +1987,7 @@ dissect_dap_DirectoryBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, proto_tree_add_text(tree, tvb, offset, -1,"Anonymous"); if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " anonymous"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); } /* do the default thing */ @@ -4679,7 +4679,7 @@ dissect_dap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(dap_dissector) { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, dap_op_name); + col_set_str(pinfo->cinfo, COL_INFO, dap_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; @@ -6377,7 +6377,7 @@ void proto_reg_handoff_dap(void) { /* APPLICATION CONTEXT */ - add_oid_str_name("2.5.3.1", "id-ac-directory-access"); + oid_add_from_string("id-ac-directory-access","2.5.3.1"); /* ABSTRACT SYNTAXES */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index 64f6abcc84..616865d1d1 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-dop.c */ +/* packet-dop.c */ /* ../../tools/asn2wrs.py -b -X -T -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ /* Input file: packet-dop-template.c */ @@ -2182,7 +2182,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(dop_dissector) { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, dop_op_name); + col_set_str(pinfo->cinfo, COL_INFO, dop_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; @@ -3103,7 +3103,7 @@ void proto_reg_handoff_dop(void) { #line 297 "packet-dop-template.c" /* APPLICATION CONTEXT */ - add_oid_str_name("2.5.3.3", "id-ac-directory-operational-binding-management"); + oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3"); /* ABSTRACT SYNTAXES */ @@ -3114,26 +3114,26 @@ void proto_reg_handoff_dop(void) { /* BINDING TYPES */ - 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"); + oid_add_from_string("shadow-agreement","2.5.19.1"); + oid_add_from_string("hierarchical-agreement","2.5.19.2"); + oid_add_from_string("non-specific-hierarchical-agreement","2.5.19.3"); /* ACCESS CONTROL SCHEMES */ - 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"); + oid_add_from_string("basic-ACS","2.5.28.1"); + oid_add_from_string("simplified-ACS","2.5.28.2"); + oid_add_from_string("ruleBased-ACS","2.5.28.3"); + oid_add_from_string("ruleAndBasic-ACS","2.5.28.4"); + oid_add_from_string("ruleAndSimple-ACS","2.5.28.5"); /* ADMINISTRATIVE ROLES */ - 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"); + oid_add_from_string("id-ar-autonomousArea","2.5.23.1"); + oid_add_from_string("id-ar-accessControlSpecificArea","2.5.23.2"); + oid_add_from_string("id-ar-accessControlInnerArea","2.5.23.3"); + oid_add_from_string("id-ar-subschemaAdminSpecificArea","2.5.23.4"); + oid_add_from_string("id-ar-collectiveAttributeSpecificArea","2.5.23.5"); + oid_add_from_string("id-ar-collectiveAttributeInnerArea","2.5.23.6"); + oid_add_from_string("id-ar-contextDefaultSpecificArea","2.5.23.7"); + oid_add_from_string("id-ar-serviceSpecificArea","2.5.23.8"); /* remember the tpkt handler for change in preferences */ tpkt_handle = find_dissector("tpkt"); diff --git a/epan/dissectors/packet-dop.h b/epan/dissectors/packet-dop.h index d6e1abc0be..11c95b26db 100644 --- a/epan/dissectors/packet-dop.h +++ b/epan/dissectors/packet-dop.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-dop.h */ +/* packet-dop.h */ /* ../../tools/asn2wrs.py -b -X -T -e -p dop -c dop.cnf -s packet-dop-template dop.asn */ /* Input file: packet-dop-template.h */ diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 0185daa316..085b4f86cb 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -1914,7 +1914,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if(dsp_dissector) { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, dsp_op_name); + col_set_str(pinfo->cinfo, COL_INFO, dsp_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; @@ -2588,7 +2588,7 @@ void proto_reg_handoff_dsp(void) { /* APPLICATION CONTEXT */ - add_oid_str_name("2.5.3.2", "id-ac-directory-system"); + oid_add_from_string("id-ac-directory-system","2.5.3.2"); /* ABSTRACT SYNTAXES */ diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index 64e9d5a065..1a0e2e71d3 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ftam.c */ -/* ../../tools/asn2wrs.py -b -X -T -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ +/* packet-ftam.c */ +/* ../../tools/asn2wrs.py -b -X -T -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ /* Input file: packet-ftam-template.c */ @@ -4985,7 +4985,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.Diagnostic", HFILL }}, { &hf_ftam__untag_item, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_UINT32, BASE_DEC, VALS(ftam_Contents_Type_List_item_vals), 0, "ftam.Contents_Type_List_item", HFILL }}, { &hf_ftam_document_type_name, @@ -5409,7 +5409,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.Attribute_Extensions", HFILL }}, { &hf_ftam__untag_item_01, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Charging_item", HFILL }}, { &hf_ftam_resource_identifier, @@ -5473,7 +5473,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, VALS(ftam_Access_Control_Attribute_vals), 0, "ftam.Access_Control_Attribute", HFILL }}, { &hf_ftam__untag_item_02, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Diagnostic_item", HFILL }}, { &hf_ftam_diagnostic_type, @@ -5953,7 +5953,7 @@ void proto_register_ftam(void) { FT_NONE, BASE_NONE, NULL, 0, "ftam.T_extension_attribute", HFILL }}, { &hf_ftam__untag_item_03, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Scope_item", HFILL }}, { &hf_ftam_root_directory, @@ -6161,7 +6161,7 @@ void proto_register_ftam(void) { FT_NONE, BASE_NONE, NULL, 0, "ftam.T_extension_attribute_Pattern", HFILL }}, { &hf_ftam__untag_item_04, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Read_Attributes", HFILL }}, { &hf_ftam_success_Object_count, @@ -6185,7 +6185,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, NULL, 0, "ftam.Password", HFILL }}, { &hf_ftam__untag_item_05, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_NONE, BASE_NONE, NULL, 0, "ftam.Path_Access_Passwords_item", HFILL }}, { &hf_ftam_ap, @@ -6197,7 +6197,7 @@ void proto_register_ftam(void) { FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0, "ftam.AE_qualifier", HFILL }}, { &hf_ftam__untag_item_06, - { "Item", "ftam.untag_item", + { "Item", "ftam._untag_item", FT_UINT32, BASE_DEC, NULL, 0, "ftam.AND_Set", HFILL }}, { &hf_ftam_Protocol_Version_U_version_1, @@ -6739,20 +6739,20 @@ void proto_reg_handoff_ftam(void) { /* Unstructured text file document type FTAM-1 */ register_ber_oid_dissector("1.0.8571.5.1", dissect_ftam_unstructured_text, proto_ftam,"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.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"); + oid_add_from_string("ISO FTAM sequential text","1.0.8571.5.2"); + oid_add_from_string("FTAM unstructured text abstract syntax","1.0.8571.2.3"); + oid_add_from_string("FTAM simple-hierarchy","1.0.8571.2.5"); + oid_add_from_string("FTAM hierarchical file model","1.0.8571.3.1"); + oid_add_from_string("FTAM unstructured constraint set","1.0.8571.4.1"); /* Unstructured binary file document type FTAM-3 */ register_ber_oid_dissector("1.0.8571.5.3", dissect_ftam_unstructured_binary, proto_ftam,"ISO FTAM unstructured binary"); - add_oid_str_name("1.0.8571.2.4","FTAM unstructured binary abstract syntax"); + oid_add_from_string("FTAM unstructured binary abstract syntax","1.0.8571.2.4"); /* Filedirectory file document type NBS-9 */ - add_oid_str_name("1.3.14.5.5.9","NBS-9 FTAM file directory file"); + oid_add_from_string("NBS-9 FTAM file directory file","1.3.14.5.5.9"); /* Filedirectory file document type NBS-9 (WITH OLD NIST OIDs)*/ - 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"); + oid_add_from_string("NBS-9-OLD FTAM file directory file","1.3.9999.1.5.9"); + oid_add_from_string("NIST file directory entry abstract syntax","1.3.9999.1.2.2"); } diff --git a/epan/dissectors/packet-ftam.h b/epan/dissectors/packet-ftam.h index 6b04f64fb6..41636c6efc 100644 --- a/epan/dissectors/packet-ftam.h +++ b/epan/dissectors/packet-ftam.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-ftam.h */ -/* ../../tools/asn2wrs.py -b -X -T -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ +/* packet-ftam.h */ +/* ../../tools/asn2wrs.py -b -X -T -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn */ /* Input file: packet-ftam-template.h */ diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 8898d9cd64..5d28634161 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -10890,12 +10890,12 @@ void proto_register_h225(void) { register_init_routine(&h225_init_routine); h225_tap = register_tap("h225"); - add_oid_str_name("0.0.8.2250.0.1", "itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 1 - Version 1"); - add_oid_str_name("0.0.8.2250.0.2", "itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 2 - Version 2"); - add_oid_str_name("0.0.8.2250.0.3", "itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 3 - Version 3"); - add_oid_str_name("0.0.8.2250.0.4", "itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 4 - Version 4"); - add_oid_str_name("0.0.8.2250.0.5", "itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 5 - Version 5"); - add_oid_str_name("0.0.8.2250.0.6", "itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 6 - Version 6"); + oid_add_from_string("Version 1","0.0.8.2250.0.1"); + oid_add_from_string("Version 2","0.0.8.2250.0.2"); + oid_add_from_string("Version 3","0.0.8.2250.0.3"); + oid_add_from_string("Version 4","0.0.8.2250.0.4"); + oid_add_from_string("Version 5","0.0.8.2250.0.5"); + oid_add_from_string("Version 6","0.0.8.2250.0.6"); } diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index c1b40c0255..3a0765c802 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixproxy.c */ -/* ../../tools/asn2wrs.py -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* packet-pkixproxy.c */ +/* ../../tools/asn2wrs.py -b -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.c */ @@ -229,8 +229,8 @@ void proto_reg_handoff_pkixproxy(void) { /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ #line 81 "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"); + oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); + oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); + oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); } diff --git a/epan/dissectors/packet-pkixproxy.h b/epan/dissectors/packet-pkixproxy.h index 83637cbabf..55cc5c6eaa 100644 --- a/epan/dissectors/packet-pkixproxy.h +++ b/epan/dissectors/packet-pkixproxy.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-pkixproxy.h */ -/* ../../tools/asn2wrs.py -b -e -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ +/* packet-pkixproxy.h */ +/* ../../tools/asn2wrs.py -b -p pkixproxy -c pkixproxy.cnf -s packet-pkixproxy-template PKIXProxy.asn */ /* Input file: packet-pkixproxy-template.h */ diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index 389c232720..9faec532f2 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-wlancertextn.c */ -/* ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ +/* packet-wlancertextn.c */ +/* ../../tools/asn2wrs.py -b -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ /* Input file: packet-wlancertextn-template.c */ @@ -172,7 +172,7 @@ void proto_reg_handoff_wlancertextn(void) { /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ #line 85 "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"); + oid_add_from_string("id-kp-eapOverPPP","1.3.6.1.5.5.7.3.13"); + oid_add_from_string("id-kp-eapOverLAN","1.3.6.1.5.5.7.3.14"); } diff --git a/epan/dissectors/packet-wlancertextn.h b/epan/dissectors/packet-wlancertextn.h index 9fd8beebcc..dbb5510f82 100644 --- a/epan/dissectors/packet-wlancertextn.h +++ b/epan/dissectors/packet-wlancertextn.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* ./packet-wlancertextn.h */ -/* ../../tools/asn2wrs.py -b -e -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ +/* packet-wlancertextn.h */ +/* ../../tools/asn2wrs.py -b -p wlancertextn -c wlancertextn.cnf -s packet-wlancertextn-template WLANCERTEXTN.asn */ /* Input file: packet-wlancertextn-template.h */ diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 7dff885cc7..547a9a3cfe 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -7095,7 +7095,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, x411_op_name); + col_set_str(pinfo->cinfo, COL_INFO, x411_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; @@ -9324,7 +9324,7 @@ void proto_reg_handoff_x411(void) { /* APPLICATION CONTEXT */ - add_oid_str_name("2.6.0.1.6", "id-ac-mts-transfer"); + oid_add_from_string("id-ac-mts-transfer","2.6.0.1.6"); /* ABSTRACT SYNTAXES */ |