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

1 files changed, 19 insertions, 19 deletions

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");