* Routines for X.711 CMIP packet dissection
* Ronnie Sahlberg 2004
*
- * $Id$
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
-#include <glib.h>
#include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/oid_resolv.h>
+#include <epan/expert.h>
+#include <epan/oids.h>
#include <epan/asn1.h>
-#include <stdio.h>
-#include <string.h>
-
#include "packet-ber.h"
#include "packet-acse.h"
#include "packet-x509if.h"
#define PSNAME "CMIP"
#define PFNAME "cmip"
+void proto_register_cmip(void);
+void proto_reg_handoff_cmip(void);
+
/* XXX some stuff we need until we can get rid of it */
#include "packet-ses.h"
#include "packet-pres.h"
/* Initialize the protocol and registered fields */
-int proto_cmip = -1;
+static int proto_cmip = -1;
static int hf_cmip_actionType_OID = -1;
static int hf_cmip_eventType_OID = -1;
static int hf_cmip_attributeId_OID = -1;
static gint ett_cmip = -1;
#include "packet-cmip-ett.c"
+static expert_field ei_wrong_spdu_type = EI_INIT;
+
static guint32 opcode;
-static const value_string cmip_Opcode_vals[] = {
- { 0, "m-EventReport" },
- { 1, "m-EventReport-Confirmed" },
- { 2, "m-Linked-Reply" },
- { 3, "m-Get" },
- { 4, "m-Set" },
- { 5, "m-Set-Confirmed" },
- { 6, "m-Action" },
- { 7, "m-Action-Confirmed" },
- { 8, "m-Create" },
- { 9, "m-Delete" },
- { 10, "m-CancelGet" },
- { 0, NULL }
-};
-
-static const value_string cmip_error_code_vals[] = {
- { 0, "noSuchObjectClass" },
- { 1, "noSuchObjectInstance" },
- { 2, "accessDenied" },
- { 3, "syncNotSupported" },
- { 4, "invalidFilter" },
- { 5, "noSuchAttribute" },
- { 6, "invalidAttributeValue" },
- { 7, "getListError" },
- { 8, "setListError" },
- { 9, "noSuchAction" },
- { 10, "processingFailure" },
- { 11, "duplicateManagedObjectInstance" },
- { 12, "noSuchReferenceObject" },
- { 13, "noSuchEventType" },
- { 14, "noSuchArgument" },
- { 15, "invalidArgumentValue" },
- { 16, "invalidScope" },
- { 17, "invalidObjectInstance" },
- { 18, "missingAttributeValue" },
- { 19, "classInstanceConflict" },
- { 20, "complexityLimitation" },
- { 21, "mistypedOperation" },
- { 22, "noSuchInvokeId" },
- { 23, "operationCancelled" },
- { 0, NULL }
-};
+/* Dissector table */
+static dissector_table_t attribute_id_dissector_table;
+
+#include "packet-cmip-table.c"
static int opcode_type;
#define OPCODE_INVOKE 1
#define OPCODE_RETURN_ERROR 3
#define OPCODE_REJECT 4
-static int attributeform;
-#define ATTRIBUTE_LOCAL_FORM 0
-#define ATTRIBUTE_GLOBAL_FORM 1
-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"
/* XXX this one should be broken out later and moved into the conformance file */
-static void
-dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
+static int
+dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data)
{
- static struct SESSION_DATA_STRUCTURE* session = NULL;
- proto_item *item = NULL;
- proto_tree *tree = NULL;
+ struct SESSION_DATA_STRUCTURE* session;
+ proto_item *item;
+ proto_tree *tree;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+ /* Reject the packet if data is NULL */
+ if (data == NULL)
+ return 0;
+ session = (struct SESSION_DATA_STRUCTURE*)data;
- /* do we have spdu type from the session dissector? */
- if( !pinfo->private_data ){
- if(tree){
- proto_tree_add_text(tree, tvb, 0, -1,
- "Internal error:can't get spdu type from session dissector.");
- return;
- }
- } else {
- session = ( (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data) );
- if(session->spdu_type == 0 ){
- if(tree){
- proto_tree_add_text(tree, tvb, 0, -1,
- "Internal error:wrong spdu type %x from session dissector.",session->spdu_type);
- return;
- }
- }
+ if(session->spdu_type == 0 ) {
+ 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;
}
- if(parent_tree){
- item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, FALSE);
- tree = proto_item_add_subtree(item, ett_cmip);
- }
+ asn1_ctx.private_data = session;
+
+ item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, ENC_NA);
+ tree = proto_item_add_subtree(item, ett_cmip);
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_clear(pinfo->cinfo, COL_INFO);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
+ col_clear(pinfo->cinfo, COL_INFO);
switch(session->spdu_type){
case SES_CONNECTION_REQUEST:
case SES_CONNECTION_ACCEPT:
default:
;
}
+
+ return tvb_captured_length(tvb);
}
/*--- proto_register_cmip ----------------------------------------------*/
{ &hf_cmip_actionType_OID,
{ "actionType", "cmip.actionType_OID",
FT_STRING, BASE_NONE, NULL, 0,
- "actionType", HFILL }},
+ NULL, HFILL }},
{ &hf_cmip_eventType_OID,
{ "eventType", "cmip.eventType_OID",
FT_STRING, BASE_NONE, NULL, 0,
- "eventType", HFILL }},
+ NULL, HFILL }},
{ &hf_cmip_attributeId_OID,
{ "attributeId", "cmip.attributeId_OID",
FT_STRING, BASE_NONE, NULL, 0,
- "attributeId", HFILL }},
+ NULL, HFILL }},
{ &hf_cmip_errorId_OID,
{ "errorId", "cmip.errorId_OID",
FT_STRING, BASE_NONE, NULL, 0,
- "errorId", HFILL }},
+ NULL, HFILL }},
{ &hf_DiscriminatorConstruct,
{ "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
FT_UINT32, BASE_DEC, NULL, 0,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_Destination,
{ "Destination", "cmip.Destination",
FT_UINT32, BASE_DEC, NULL, 0,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_NameBinding,
{ "NameBinding", "cmip.NameBinding",
FT_STRING, BASE_NONE, NULL, 0,
- "", HFILL }},
+ NULL, HFILL }},
{ &hf_ObjectClass,
{ "ObjectClass", "cmip.ObjectClass",
FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
- "", HFILL }},
+ NULL, HFILL }},
#include "packet-cmip-hfarr.c"
};
#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);
+ 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"
- add_oid_str_name("2.9.3.2.7.1","discriminatorId(1) ");
+ 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, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
}
/*--- proto_reg_handoff_cmip -------------------------------------------*/
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)");
+ dissector_handle_t cmip_handle = find_dissector("cmip");
+
+ register_ber_oid_dissector_handle("2.9.0.0.2", cmip_handle, proto_cmip, "cmip");
+ register_ber_oid_dissector_handle("2.9.1.1.4", cmip_handle, proto_cmip, "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" */
}
git.samba.org / metze / wireshark / wip.git / blobdiff