- dissect_per_restricted_character_string() returns value in tvbbuff_t instead of char

- asn2eth:
  fixed CHOICE tag handling
  #.FN_PARS support for BIT STRING and all string types
  intersection of SIZE and FROM constraints for string is handled
- new asn2eth features used in h225 and h245
- PER dissectors regeneration

svn path=/trunk/; revision=15408

1 files changed, 11 insertions, 10 deletions

diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index 52caf33aba..091cb55417 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -206,20 +206,21 @@ CallIdentifier/guid guid
   h225_pi->is_destinationInfo = TRUE;
 #.END
 #----------------------------------------------------------------------------------------
-# TODO asn2eth can't handle restriced string ?
+#.FN_PARS DialedDigits
+  VAL_PTR = &value_tvb
 #.FN_BODY DialedDigits
+  tvbuff_t *value_tvb = NULL;
+  guint len = 0;
+
+%(DEFAULT_BODY)s
   if (h225_pi->is_destinationInfo == TRUE) {
-    offset = dissect_per_restricted_character_string(tvb, offset, pinfo, tree, hf_index, 1, 128, "#,*0123456789", 13, (char *)&h225_pi->dialedDigits , 64);  
+    if (value_tvb) {
+      len = tvb_length(value_tvb);
+      tvb_memcpy(value_tvb, h225_pi->dialedDigits, 0, len);
+    }
+    h225_pi->dialedDigits[len] = '\0';
 	h225_pi->is_destinationInfo = FALSE;
   }
-  else
-	offset = dissect_per_restricted_character_string(tvb, offset, pinfo, tree, hf_index, 1, 128, "#,*0123456789", 13, NULL, 0);
-#.END
-#----------------------------------------------------------------------------------------
-# TODO asn2eth can't handle restriced string ?
-#.FN_BODY NumberDigits
-
-	offset=dissect_per_restricted_character_string(tvb, offset, pinfo, tree, hf_index, 1, 128, "#,*0123456789", 13, NULL, 0);
 #.END
 #----------------------------------------------------------------------------------------
 #.FN_PARS H245TransportAddress/h245ipAddress/h245ipv4