diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-08-18 14:32:49 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-08-18 14:32:49 +0000 |
| commit | ec979a97fbb4852e81097bff634f6c517f12e0fd (patch) | |
| tree | dd7e79efbb12749d604d988903f04fc27c25b848 /asn1 | |
| parent | 6fdb97457029a88df0f01cea1ccb472490aec8a0 (diff) | |
| download | wireshark-ec979a97fbb4852e81097bff634f6c517f12e0fd.tar.gz wireshark-ec979a97fbb4852e81097bff634f6c517f12e0fd.tar.bz2 wireshark-ec979a97fbb4852e81097bff634f6c517f12e0fd.zip | |
- 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
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/h225/h225.asn | 2 | ||||
| -rw-r--r-- | asn1/h225/h225.cnf | 21 | ||||
| -rw-r--r-- | asn1/h245/h245.asn | 3 |
3 files changed, 13 insertions, 13 deletions
diff --git a/asn1/h225/h225.asn b/asn1/h225/h225.asn index 0b2145bf4d..bd94d76805 100644 --- a/asn1/h225/h225.asn +++ b/asn1/h225/h225.asn @@ -656,7 +656,7 @@ AliasAddress ::= CHOICE { partyNumber PartyNumber, mobileUIM MobileUIM } -DialedDigits ::= IA5String(SIZE (1..128)) -- (FROM ("0123456789#*,")) +DialedDigits ::= IA5String(SIZE (1..128))(FROM ("0123456789#*,")) AddressPattern ::= CHOICE { wildcard AliasAddress, range SEQUENCE {startOfRange PartyNumber, 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 diff --git a/asn1/h245/h245.asn b/asn1/h245/h245.asn index 9c05f2dcca..dc3e9f7d0a 100644 --- a/asn1/h245/h245.asn +++ b/asn1/h245/h245.asn @@ -3032,11 +3032,10 @@ UserInputIndication ::= CHOICE { encryptedIA5String NULL, -- indicates encrypted general string encryptedGeneralString NULL}, --- IA5String(SIZE (1) ^ FROM ("0123456789#*ABCD!")), signal SEQUENCE {signalType - IA5String(SIZE (1) ), + IA5String(SIZE (1))(FROM ("0123456789#*ABCD!")), -- holds dummy "!" if encryptedSignalType is being used duration INTEGER(1..65535) OPTIONAL, -- milliseconds-- rtp Rtp OPTIONAL, |