aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/h225
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2007-10-05 07:44:03 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2007-10-05 07:44:03 +0000
commite461d0d0e8dbad79f7f01249512982e951ad5e97 (patch)
tree4ace4f92d60c78b61379a93eb5f1ccedd8acbed8 /asn1/h225
parent207837b284dafc95cc5783494fc77669e8e87f44 (diff)
export more types from H.225.0 and H.245 which will be necessary for H.460.x, H.323 (Annex M,R), H.501
svn path=/trunk/; revision=23069
Diffstat (limited to 'asn1/h225')
-rw-r--r--asn1/h225/h225-exp.cnf24
-rw-r--r--asn1/h225/h225.cnf34
2 files changed, 56 insertions, 2 deletions
diff --git a/asn1/h225/h225-exp.cnf b/asn1/h225/h225-exp.cnf
index ab3249cbce..11fb609a20 100644
--- a/asn1/h225/h225-exp.cnf
+++ b/asn1/h225/h225-exp.cnf
@@ -8,13 +8,37 @@ H323-MESSAGES h225
#.END
#.TYPE_ATTR
+ReleaseCompleteReason TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ReleaseCompleteReason_vals) BITMASK = 0
PresentationIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PresentationIndicator_vals) BITMASK = 0
ScreeningIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ScreeningIndicator_vals) BITMASK = 0
+TransportAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportAddress_vals) BITMASK = 0
+EndpointType TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+SupportedProtocols TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_SupportedProtocols_vals) BITMASK = 0
+TunnelledProtocol TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
NonStandardParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
AliasAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AliasAddress_vals) BITMASK = 0
PartyNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PartyNumber_vals) BITMASK = 0
+PublicTypeOfNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PublicTypeOfNumber_vals) BITMASK = 0
+PrivateTypeOfNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PrivateTypeOfNumber_vals) BITMASK = 0
+AlternateTransportAddresses TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+GloballyUniqueID TYPE = FT_GUID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+ConferenceIdentifier TYPE = FT_GUID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+GatekeeperIdentifier TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+BandWidth TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+CallReferenceValue TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
+TimeToLive TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
CallIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+IntegrityMechanism TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_IntegrityMechanism_vals) BITMASK = 0
+ICV TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+CryptoH323Token TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_CryptoH323Token_vals) BITMASK = 0
+CircuitInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+CircuitIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+ServiceControlSession TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
GenericData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+GenericIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_GenericIdentifier_vals) BITMASK = 0
+FeatureSet TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+TransportChannelInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
RasMessage TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(RasMessage_vals) BITMASK = 0
+TransportQOS TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_TransportQOS_vals) BITMASK = 0
#.END
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index 236c3ae28d..bac9f1e2a0 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -4,6 +4,12 @@
# $Id$
#.INCLUDE ../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
#.INCLUDE ../h245/h245-exp.cnf
#----------------------------------------------------------------------------------------
@@ -18,18 +24,42 @@ BandRejectReason
DisengageReason
DisengageRejectReason
InfoRequestNakReason
-ReleaseCompleteReason
AdmissionRejectReason
LocationRejectReason
RegistrationRejectReason
+
#.EXPORTS
-NonStandardParameter
+NonStandardParameter
+PublicTypeOfNumber
+PrivateTypeOfNumber
AliasAddress NO_PROT_PREFIX
PartyNumber
PresentationIndicator
ScreeningIndicator
CallIdentifier
+ConferenceIdentifier
+CircuitIdentifier
+GenericIdentifier
GenericData
+BandWidth
+TimeToLive
+TransportAddress
+AlternateTransportAddresses
+TransportChannelInfo
+CallReferenceValue
+GloballyUniqueID
+TunnelledProtocol
+IntegrityMechanism
+ICV
+CryptoH323Token
+TransportQOS
+FeatureSet
+CircuitInfo
+EndpointType
+SupportedProtocols
+GatekeeperIdentifier
+ServiceControlSession
+ReleaseCompleteReason WS_VAR
#.END
#----------------------------------------------------------------------------------------