diff options
Diffstat (limited to 'asn1/cmip')
-rw-r--r-- | asn1/cmip/Makefile.nmake | 2 | ||||
-rw-r--r-- | asn1/cmip/cmip-exp.cnf | 2 | ||||
-rw-r--r-- | asn1/cmip/cmip.cnf | 33 | ||||
-rw-r--r-- | asn1/cmip/packet-cmip-template.c | 43 |
4 files changed, 35 insertions, 45 deletions
diff --git a/asn1/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake index 983944ca0f..8ea69b5432 100644 --- a/asn1/cmip/Makefile.nmake +++ b/asn1/cmip/Makefile.nmake @@ -17,7 +17,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN1_FILES) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN1_FILES) + $(PYTHON) "../../tools/asn2wrs.py" -b -X -T -e -k -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(ASN1_FILES) !ELSE @echo Error: You need Python to use asn2wrs.py @exit 1 diff --git a/asn1/cmip/cmip-exp.cnf b/asn1/cmip/cmip-exp.cnf index 37106d982b..6ea7d32e58 100644 --- a/asn1/cmip/cmip-exp.cnf +++ b/asn1/cmip/cmip-exp.cnf @@ -1,7 +1,7 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler # .\cmip-exp.cnf -# ../../tools/asn2wrs.py -b -X -T -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 +# ../../tools/asn2wrs.py -b -X -T -e -k -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 #.MODULE CMIP-1 cmip diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index d8f45aa5a5..9668934b9f 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -42,13 +42,42 @@ ObjectInstance ObjectClass Attribute RDNSequence -# X.721 ProbableCause AdministrativeState AvailabilityStatus AttributeList AdditionalInformation +#.TABLE_HDR +/* CMIP OPERATIONS */ +static const value_string cmip_Opcode_vals[] = { +#.TABLE_BODY OPERATION + { %(&operationCode)s, "%(_ident)s" }, +#.TABLE_FTR + { 0, NULL } +}; +#.END + +#.TABLE_HDR +/* CMIP ERRORS */ +static const value_string cmip_error_code_vals[] = { +#.TABLE_BODY ERROR + { %(&errorCode)s, "%(_ident)s" }, +#.TABLE_FTR + { 0, NULL } +}; +#.END + +#.TABLE2_BODY OPERATION +%(&operationCode)3s %(_ident)-20s, +#.END + +#.TABLE1_BODY ERROR +%(&errorCode)3s %(_ident)-20s, +#.END + +# X.721 + #.REGISTER BaseManagedObjectId B "2.9.2.21.7.13" "BaseManagedObjectId(13)" # X.721 @@ -165,8 +194,10 @@ CounterThreshold GaugeThreshold GaugeThresholdValue LogAvailability +NotifyThreshold SchedulingAvailability TideMarkInfo +TideMark UnscheduledLogAvailability Priority RejectProblem diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 174ba4e823..f151595eab 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -67,48 +67,7 @@ static gint ett_cmip = -1; 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 } -}; +#include "packet-cmip-table.c" static int opcode_type; #define OPCODE_INVOKE 1 |