diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 11:12:58 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 11:12:58 +0000 |
| commit | d376634d0f8160d2a43a06d67a26f721adaf5530 (patch) | |
| tree | 38b7f6cea9e73b4f59b365fe39b310007b8078ca /channels/h323/cisco-h225.h | |
| parent | 4ac9afef329d9525cda5dd82a8af1e4af0b054bf (diff) | |
Merged revisions 43635,43843-43844,43846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43635 | pcadach | 2006-09-26 03:26:12 +0600 (Втр, 26 Сен 2006) | 1 line
Fix ASN1 description of non-standard Cisco extensions
........
r43843 | pcadach | 2006-09-28 12:01:37 +0600 (Чтв, 28 Сен 2006) | 1 line
Don't treat unknown control frames as voice
........
r43844 | pcadach | 2006-09-28 12:02:45 +0600 (Чтв, 28 Сен 2006) | 1 line
Don't warn on HOLD/UNHOLD control frames
........
r43846 | pcadach | 2006-09-28 16:51:21 +0600 (Чтв, 28 Сен 2006) | 1 line
Do not open transmit channel until TCS is received
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43853 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323/cisco-h225.h')
| -rw-r--r-- | channels/h323/cisco-h225.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/h323/cisco-h225.h b/channels/h323/cisco-h225.h index db4e0af0b..7595b4b65 100644 --- a/channels/h323/cisco-h225.h +++ b/channels/h323/cisco-h225.h @@ -262,8 +262,8 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence e_version, e_protoParam, e_commonParam, - e_progIndParam, e_dummy1, + e_progIndParam, e_callMgrParam, e_callSignallingParam, e_dummy2, @@ -273,8 +273,8 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence PASN_Integer m_version; CISCO_H225_ProtoParam m_protoParam; CISCO_H225_CommonParam m_commonParam; - CISCO_H225_ProgIndParam m_progIndParam; PASN_OctetString m_dummy1; + CISCO_H225_ProgIndParam m_progIndParam; CISCO_H225_CallMgrParam m_callMgrParam; CISCO_H225_CallSignallingParam m_callSignallingParam; PASN_OctetString m_dummy2; |