Regenerated with SIZE constraints checking.

Added MMSUpperBounds.asn.

svn path=/trunk/; revision=31312

4 files changed, 34 insertions, 6 deletions

diff --git a/asn1/s4406/MMSUpperBounds.asn b/asn1/s4406/MMSUpperBounds.asn
new file mode 100644
index 0000000000..52118e9a93
--- /dev/null
+++ b/asn1/s4406/MMSUpperBounds.asn
@@ -0,0 +1,26 @@
+-- $Id$
+MMSUpperBounds {iso(1) identified-organization(3) nato(26) stanags(0)
+  mmhs(4406) object-identifiers(0) module(0) upper-bounds(0)} DEFINITIONS
+IMPLICIT TAGS ::=
+BEGIN
+
+-- Prologue
+-- Exports Everything
+IMPORTS -- nothing -- ;
+
+-- Upper Bounds
+ub-military-string INTEGER ::= 69
+
+ub-military-number-of-sics INTEGER ::= 8
+
+lb-military-sic INTEGER ::= 3
+
+ub-military-sic INTEGER ::= 8
+
+ub-military-bigstring INTEGER ::= 128
+
+ub-data-size INTEGER ::= 65535
+
+-- size of ACP127DATADATA
+END -- of MMSUpperBounds 
+
diff --git a/asn1/s4406/Makefile.common b/asn1/s4406/Makefile.common
index 2825d1ae24..86cdef9855 100644
--- a/asn1/s4406/Makefile.common
+++ b/asn1/s4406/Makefile.common
@@ -28,7 +28,7 @@ DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
 
 EXT_ASN_FILE_LIST =
 
-ASN_FILE_LIST = $(PROTOCOL_NAME).asn
+ASN_FILE_LIST = $(PROTOCOL_NAME).asn MMSUpperBounds.asn
 
 # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
 # files do not exist for all protocols: Please add/remove as required.
@@ -43,7 +43,7 @@ SRC_FILES = \
 	$(EXTRA_DIST) \
 	$(EXT_ASN_FILE_LIST)
 
-A2W_FLAGS= -b 
+A2W_FLAGS= -b -e -C
 
 EXTRA_CNF= \
 	../x411/x411-exp.cnf \
diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c
index 7b248a3f57..53bfacab47 100644
--- a/asn1/s4406/packet-s4406-template.c
+++ b/asn1/s4406/packet-s4406-template.c
@@ -49,6 +49,8 @@
 /* Initialize the protocol and registered fields */
 static int proto_s4406 = -1;
 
+#include "packet-s4406-val.h"
+
 #include "packet-s4406-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/asn1/s4406/s4406.asn b/asn1/s4406/s4406.asn
index e3de8b8551..0bd58c6d4a 100644
--- a/asn1/s4406/s4406.asn
+++ b/asn1/s4406/s4406.asn
@@ -80,13 +80,13 @@ ExtendedAuthorisationInfo ::= UTCTime
 --	::= id-nato-mmhs-mm-distribution-codes
 
 DistributionCodes ::= SET {
-	sics	[0]	SEQUENCE --SIZE
---				(1..ub-military-number-of-sics)-- OF
+	sics	[0]	SEQUENCE SIZE
+				(1..ub-military-number-of-sics) OF
 				Sic OPTIONAL,
 	dist-Extensions	[1]	SEQUENCE OF
 				DistributionExtensionField OPTIONAL }
 
-Sic ::= PrintableString --(SIZE (lb-military-sic..ub-military-sic))
+Sic ::= PrintableString (SIZE (lb-military-sic..ub-military-sic))
 
 DistributionExtensionField ::= SEQUENCE {
 	dist-type	OBJECT IDENTIFIER,
@@ -101,7 +101,7 @@ DistributionExtensionField ::= SEQUENCE {
 
 HandlingInstructions ::= SEQUENCE OF MilitaryString
 
-MilitaryString ::= PrintableString --(SIZE(1..ub-military-string))
+MilitaryString ::= PrintableString (SIZE(1..ub-military-string))
 
 
 -- Message instructions