diff options
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/acse/packet-acse-template.c | 2 | ||||
| -rw-r--r-- | asn1/cmip/packet-cmip-template.c | 34 | ||||
| -rw-r--r-- | asn1/cms/packet-cms-template.c | 6 | ||||
| -rw-r--r-- | asn1/disp/packet-disp-template.c | 10 |
4 files changed, 26 insertions, 26 deletions
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index aeb2b6ee6a..984e488cf4 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -272,7 +272,7 @@ void proto_register_acse(void) { void proto_reg_handoff_acse(void) { /*#include "packet-acse-dis-tab.c"*/ - add_oid_str_name("2.2.3.1.1","aCSE-id"); + oid_add_from_string("aCSE-id","2.2.3.1.1"); register_ber_oid_dissector(ACSE_APDU_OID, dissect_acse, proto_acse, "acse-as-id"); diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 9fc6cb1d5e..fb91f449e8 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -206,7 +206,7 @@ void proto_register_cmip(void) { proto_register_field_array(proto_cmip, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); #include "packet-cmip-dis-tab.c" - add_oid_str_name("2.9.3.2.7.1","discriminatorId(1)"); + oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); } @@ -216,22 +216,22 @@ void proto_reg_handoff_cmip(void) { register_ber_oid_dissector("2.9.0.0.2", dissect_cmip, proto_cmip, "cmip"); register_ber_oid_dissector("2.9.1.1.4", dissect_cmip, proto_cmip, "joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); - add_oid_str_name("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)"); - add_oid_str_name("2.9.3.2.3.2","managedObjectClass(3) attributeValueChangeRecord(2)"); - add_oid_str_name("2.9.3.2.3.3","managedObjectClass(3) discriminator(3)"); - add_oid_str_name("2.9.3.2.3.4","managedObjectClass(3) eventForwardingDiscriminator(4)"); - add_oid_str_name("2.9.3.2.3.5","managedObjectClass(3) eventLogRecord(5)"); - add_oid_str_name("2.9.3.2.3.6","managedObjectClass(3) log(6)"); - add_oid_str_name("2.9.3.2.3.7","managedObjectClass(3) logRecord(7)"); - add_oid_str_name("2.9.3.2.3.8","managedObjectClass(3) objectCreationRecord(8)"); - add_oid_str_name("2.9.3.2.3.9","managedObjectClass(3) objectDeletionRecord(9)"); - add_oid_str_name("2.9.3.2.3.10","managedObjectClass(3) relationshipChangeRecord(10)"); - add_oid_str_name("2.9.3.2.3.11","managedObjectClass(3) securityAlarmReportRecord(11)"); - add_oid_str_name("2.9.3.2.3.12","managedObjectClass(3) stateChangeRecord(12)"); - add_oid_str_name("2.9.3.2.3.13","managedObjectClass(3) system(13)"); - add_oid_str_name("2.9.3.2.3.14","managedObjectClass(3) top(14)"); - add_oid_str_name("2.9.3.2.4.14","administrativeStatePackage(14)"); - add_oid_str_name("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); + oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)"); + oid_add_from_string("2.9.3.2.3.2","managedObjectClass(3) attributeValueChangeRecord(2)"); + oid_add_from_string("2.9.3.2.3.3","managedObjectClass(3) discriminator(3)"); + oid_add_from_string("2.9.3.2.3.4","managedObjectClass(3) eventForwardingDiscriminator(4)"); + oid_add_from_string("2.9.3.2.3.5","managedObjectClass(3) eventLogRecord(5)"); + oid_add_from_string("2.9.3.2.3.6","managedObjectClass(3) log(6)"); + oid_add_from_string("2.9.3.2.3.7","managedObjectClass(3) logRecord(7)"); + oid_add_from_string("2.9.3.2.3.8","managedObjectClass(3) objectCreationRecord(8)"); + oid_add_from_string("2.9.3.2.3.9","managedObjectClass(3) objectDeletionRecord(9)"); + oid_add_from_string("2.9.3.2.3.10","managedObjectClass(3) relationshipChangeRecord(10)"); + oid_add_from_string("2.9.3.2.3.11","managedObjectClass(3) securityAlarmReportRecord(11)"); + oid_add_from_string("2.9.3.2.3.12","managedObjectClass(3) stateChangeRecord(12)"); + oid_add_from_string("2.9.3.2.3.13","managedObjectClass(3) system(13)"); + oid_add_from_string("2.9.3.2.3.14","managedObjectClass(3) top(14)"); + oid_add_from_string("2.9.3.2.4.14","administrativeStatePackage(14)"); + oid_add_from_string("2.9.1.1.4","joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)"); /*#include "packet-cmip-dis-tab.c" */ } diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 571d7e4ad3..ee82ee539a 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -172,9 +172,9 @@ void proto_register_cms(void) { void proto_reg_handoff_cms(void) { #include "packet-cms-dis-tab.c" - add_oid_str_name("1.2.840.113549.1.7.1", "id-data"); - add_oid_str_name("1.2.840.113549.3.7", "id-alg-des-ede3-cbc"); - add_oid_str_name("1.3.14.3.2.7", "id-alg-des-cbc"); + oid_add_from_string("id-data","1.2.840.113549.1.7.1"); + oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7"); + oid_add_from_string("id-alg-des-cbc","1.3.14.3.2.7"); } diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index f4d84fa4d1..3dac6aef1b 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -247,10 +247,10 @@ void proto_reg_handoff_disp(void) { /* APPLICATION CONTEXT */ - 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"); + oid_add_from_string("id-ac-shadow-consumer-initiated","2.5.3.4"); + oid_add_from_string("id-ac-shadow-supplier-initiated","2.5.3.5"); + oid_add_from_string("id-ac-reliable-shadow-consumer-initiated","2.5.3.6"); + oid_add_from_string("id-ac-reliable-shadow-supplier-initiated","2.5.3.7"); /* ABSTRACT SYNTAXES */ @@ -263,7 +263,7 @@ void proto_reg_handoff_disp(void) { } /* OPERATIONAL BINDING */ - add_oid_str_name("2.5.1.0.5.1", "id-op-binding-shadow"); + oid_add_from_string("id-op-binding-shadow","2.5.1.0.5.1"); tpkt_handle = find_dissector("tpkt"); |