[Automatic update for 2016-03-13]

[metze/wireshark/wip.git] / asn1 / cmip / packet-cmip-template.c

diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 12b2d057e2efbcda4516be0d1e0541f763e13e51..6ecbaf9918572f467fc2cb35ca7a1dd5b7a1866d 100644 (file)
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <epan/packet.h>
+#include <epan/expert.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
@@ -60,6 +60,8 @@ static int hf_ObjectClass = -1;
 static gint ett_cmip = -1;
 #include "packet-cmip-ett.c"
 
+static expert_field ei_wrong_spdu_type = EI_INIT;
+
 static guint32 opcode;
 
 /* Dissector table */
@@ -73,21 +75,8 @@ static int opcode_type;
 #define OPCODE_RETURN_ERROR  3
 #define OPCODE_REJECT        4
 
-static int attributeform;
-#define ATTRIBUTE_LOCAL_FORM  0
-#define ATTRIBUTE_GLOBAL_FORM 1
-static int attribute_local_id;
-static const char *attribute_identifier_id;
-
-static const char *attributevalueassertion_id;
-
 static const char *object_identifier_id;
 
-static int objectclassform;
-#define OBJECTCLASS_LOCAL_FORM  0
-#define OBJECTCLASS_GLOBAL_FORM 1
-static const char *objectclass_identifier_id;
-
 #include "packet-cmip-val.h"
 #include "packet-cmip-fn.c"
 
@@ -110,8 +99,8 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
        session = (struct SESSION_DATA_STRUCTURE*)data;
 
        if(session->spdu_type == 0 ) {
-               proto_tree_add_text(parent_tree, tvb, 0, -1,
-                       "Internal error:wrong spdu type %x from session dissector.",session->spdu_type);
+               proto_tree_add_expert_format(parent_tree, pinfo, &ei_wrong_spdu_type, tvb, 0, -1,
+                       "Internal error: wrong spdu type %x from session dissector.", session->spdu_type);
                return 0;
        }
 
@@ -190,17 +179,26 @@ void proto_register_cmip(void) {
 #include "packet-cmip-ettarr.c"
   };
 
+  static ei_register_info ei[] = {
+     { &ei_wrong_spdu_type, { "cmip.wrong_spdu_type", PI_PROTOCOL, PI_ERROR, "Internal error: wrong spdu type", EXPFILL }},
+  };
+
+  expert_module_t* expert_cmip;
+
   /* Register protocol */
   proto_cmip = proto_register_protocol(PNAME, PSNAME, PFNAME);
-  new_register_dissector("cmip", dissect_cmip, proto_cmip);
+  register_dissector("cmip", dissect_cmip, proto_cmip);
 
   /* Register fields and subtrees */
   proto_register_field_array(proto_cmip, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
+  expert_cmip = expert_register_protocol(proto_cmip);
+  expert_register_field_array(expert_cmip, ei, array_length(ei));
+
 #include "packet-cmip-dis-tab.c"
     oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1");
 
-  attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", FT_UINT32, BASE_DEC);
+  attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 
 }