diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-11-10 13:31:16 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-11-10 13:31:16 +0000 |
| commit | bfdccf3f9d57c2a0637e71734191ca84cdfde694 (patch) | |
| tree | 3f5b3ae8b36e30dca825fe2964ffa7ebe07705a1 /asn1/h225 | |
| parent | e20cfef6f9e20c390629fc2f112dfb54484c8fac (diff) | |
| download | wireshark-bfdccf3f9d57c2a0637e71734191ca84cdfde694.tar.gz | |
- update H.245 to v14 (06/2008)
- use #.MODULE_EXPORT to avoid conflict between TransportAddress from H.225 and H.245
- regenerate H.323 family dissectors
svn path=/trunk/; revision=26739
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/h225.cnf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 448764e930..2a645dcf80 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -5,11 +5,11 @@ #.IMPORT ../h235/h235-exp.cnf -#.TYPE_ATTR -# override TransportAddress from H.245 -# temporary solution till collision between imported and defined type is solved in the asn2wrs -TransportAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportAddress_vals) BITMASK = 0 -#.END + + + + + #.IMPORT ../h245/h245-exp.cnf #---------------------------------------------------------------------------------------- @@ -27,7 +27,7 @@ AdmissionRejectReason LocationRejectReason RegistrationRejectReason -#.EXPORTS +#.MODULE_EXPORTS RasMessage WS_VAR NonStandardParameter PublicTypeOfNumber |