Added check for SIZE constraints in bit-string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31447 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 10 insertions, 4 deletions

diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index 314415ce69..3d6e91fe00 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -5220,10 +5220,16 @@ class BitStringType (Type):
 
   def eth_type_default_body(self, ectx, tname):
     if (ectx.Ber()):
-      body = ectx.eth_fn_call('dissect_%(ER)s_bitstring', ret='offset',
-                              par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
-                                   ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),
-                                   ('%(VAL_PTR)s',),))
+      if (ectx.constraints_check and self.HasSizeConstraint()):
+        body = ectx.eth_fn_call('dissect_%(ER)s_constrained_bitstring', ret='offset',
+                                par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
+                                     ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),
+                                     ('%(VAL_PTR)s',),))
+      else:
+        body = ectx.eth_fn_call('dissect_%(ER)s_bitstring', ret='offset',
+                                par=(('%(IMPLICIT_TAG)s', '%(ACTX)s', '%(TREE)s', '%(TVB)s', '%(OFFSET)s'),
+                                     ('%(TABLE)s', '%(HF_INDEX)s', '%(ETT_INDEX)s',),
+                                     ('%(VAL_PTR)s',),))
     elif (ectx.Per()):
       if self.HasContentsConstraint():
         body = ectx.eth_fn_call('dissect_%(ER)s_bit_string_containing%(FN_VARIANT)s', ret='offset',