aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asn1/acse/packet-acse-template.c2
-rw-r--r--asn1/cmip/packet-cmip-template.c34
-rw-r--r--asn1/cms/packet-cms-template.c6
-rw-r--r--asn1/disp/packet-disp-template.c10
-rw-r--r--epan/dissectors/packet-acse.c4
-rw-r--r--epan/dissectors/packet-acse.h2
-rw-r--r--epan/dissectors/packet-cmip.c40
-rw-r--r--epan/dissectors/packet-cmip.h2
-rw-r--r--epan/dissectors/packet-cms.c8
-rw-r--r--epan/dissectors/packet-cms.h2
-rw-r--r--epan/dissectors/packet-disp.c26
11 files changed, 68 insertions, 68 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");
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 096d08b1eb..9861fd8182 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* ./packet-acse.c */
+/* packet-acse.c */
/* ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
/* Input file: packet-acse-template.c */
@@ -2495,7 +2495,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/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h
index 45586a844e..5bc4693709 100644
--- a/epan/dissectors/packet-acse.h
+++ b/epan/dissectors/packet-acse.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* ./packet-acse.h */
+/* packet-acse.h */
/* ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
/* Input file: packet-acse-template.h */
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 3312be8b07..cb10500c92 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* ./packet-cmip.c */
+/* packet-cmip.c */
/* ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
/* Input file: packet-cmip-template.c */
@@ -2609,7 +2609,7 @@ int
dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 222 "cmip.cnf"
if(check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
}
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
@@ -2672,7 +2672,7 @@ int
dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 228 "cmip.cnf"
if(check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
}
offset = dissect_ber_old_sequence(implicit_tag, actx, tree, tvb, offset,
@@ -6428,7 +6428,7 @@ void proto_register_cmip(void) {
/*--- End of included file: packet-cmip-dis-tab.c ---*/
#line 209 "packet-cmip-template.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");
}
@@ -6438,22 +6438,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/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h
index f35ebb6604..ab3276de76 100644
--- a/epan/dissectors/packet-cmip.h
+++ b/epan/dissectors/packet-cmip.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* ./packet-cmip.h */
+/* packet-cmip.h */
/* ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
/* Input file: packet-cmip-template.h */
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index fbfd0688d0..5e90d787d7 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* ./packet-cms.c */
+/* packet-cms.c */
/* ../../tools/asn2wrs.py -b -X -T -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
/* Input file: packet-cms-template.c */
@@ -2125,9 +2125,9 @@ void proto_reg_handoff_cms(void) {
/*--- End of included file: packet-cms-dis-tab.c ---*/
#line 174 "packet-cms-template.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/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h
index 823c34582e..f99a3cb9d6 100644
--- a/epan/dissectors/packet-cms.h
+++ b/epan/dissectors/packet-cms.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
-/* ./packet-cms.h */
+/* packet-cms.h */
/* ../../tools/asn2wrs.py -b -X -T -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
/* Input file: packet-cms-template.h */
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 6cb951ef8f..0c2953b18a 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -519,7 +519,7 @@ static const ber_sequence_t UnitOfReplication_sequence[] = {
{ &hf_disp_replication_attributes, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_disp_AttributeSelection },
{ &hf_disp_knowledge , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_disp_Knowledge },
{ &hf_disp_subordinates , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_disp_BOOLEAN },
- { &hf_disp_contextSelection, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_ContextSelection },
+ { &hf_disp_contextSelection, -1 /*imported*/, -1 /*imported*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_ContextSelection },
{ &hf_disp_supplyContexts , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_disp_T_supplyContexts },
{ NULL, 0, 0, 0, NULL }
};
@@ -706,7 +706,7 @@ static const ber_sequence_t CoordinateShadowUpdateArgumentData_sequence[] = {
{ &hf_disp_agreementID , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID },
{ &hf_disp_lastUpdate , BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_disp_Time },
{ &hf_disp_updateStrategy , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_disp_T_updateStrategy },
- { &hf_disp_securityParameters, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_SecurityParameters },
+ { &hf_disp_securityParameters, -1 /*imported*/, -1 /*imported*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_SecurityParameters },
{ NULL, 0, 0, 0, NULL }
};
@@ -922,7 +922,7 @@ static const ber_sequence_t RequestShadowUpdateArgumentData_sequence[] = {
{ &hf_disp_agreementID , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID },
{ &hf_disp_lastUpdate , BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_disp_Time },
{ &hf_disp_requestedStrategy, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_disp_T_requestedStrategy },
- { &hf_disp_securityParameters, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_SecurityParameters },
+ { &hf_disp_securityParameters, -1 /*imported*/, -1 /*imported*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_SecurityParameters },
{ NULL, 0, 0, 0, NULL }
};
@@ -1140,7 +1140,7 @@ dissect_disp_T_rename(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
static const ber_sequence_t SEQUENCE_OF_EntryModification_sequence_of[1] = {
- { &hf_disp_changes_item , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dap_EntryModification },
+ { &hf_disp_changes_item , -1 /*imported*/, -1 /*imported*/, BER_FLAGS_NOOWNTAG, dissect_dap_EntryModification },
};
static int
@@ -1314,7 +1314,7 @@ static const ber_sequence_t UpdateShadowArgumentData_sequence[] = {
{ &hf_disp_updateTime , BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_disp_Time },
{ &hf_disp_updateWindow , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_disp_UpdateWindow },
{ &hf_disp_updatedInfo , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_disp_RefreshInformation },
- { &hf_disp_securityParameters, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_SecurityParameters },
+ { &hf_disp_securityParameters, -1 /*imported*/, -1 /*imported*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_dap_SecurityParameters },
{ NULL, 0, 0, 0, NULL }
};
@@ -1616,7 +1616,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
if(disp_dissector) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, disp_op_name);
+ col_set_str(pinfo->cinfo, COL_INFO, disp_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
@@ -1694,7 +1694,7 @@ void proto_register_disp(void) {
"disp.BOOLEAN", HFILL }},
{ &hf_disp_contextSelection,
{ "contextSelection", "disp.contextSelection",
- FT_UINT32, BASE_DEC, VALS(dap_ContextSelection_vals), 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"dap.ContextSelection", HFILL }},
{ &hf_disp_supplyContexts,
{ "supplyContexts", "disp.supplyContexts",
@@ -2042,7 +2042,7 @@ void proto_register_disp(void) {
"disp.SEQUENCE_OF_EntryModification", HFILL }},
{ &hf_disp_changes_item,
{ "Item", "disp.changes_item",
- FT_UINT32, BASE_DEC, VALS(dap_EntryModification_vals), 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"dap.EntryModification", HFILL }},
{ &hf_disp_subordinate,
{ "subordinate", "disp.subordinate",
@@ -2182,10 +2182,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 */
@@ -2198,7 +2198,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");
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 01:56:09 +0000