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.cxx | |
| 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.cxx')
| -rw-r--r-- | channels/h323/cisco-h225.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/h323/cisco-h225.cxx b/channels/h323/cisco-h225.cxx index 1b52f4ca0..37adc4e87 100644 --- a/channels/h323/cisco-h225.cxx +++ b/channels/h323/cisco-h225.cxx @@ -739,10 +739,10 @@ void CISCO_H225_H323_UU_NonStdInfo::PrintOn(ostream & strm) const strm << setw(indent+13) << "protoParam = " << setprecision(indent) << m_protoParam << '\n'; if (HasOptionalField(e_commonParam)) strm << setw(indent+14) << "commonParam = " << setprecision(indent) << m_commonParam << '\n'; - if (HasOptionalField(e_progIndParam)) - strm << setw(indent+15) << "progIndParam = " << setprecision(indent) << m_progIndParam << '\n'; if (HasOptionalField(e_dummy1)) strm << setw(indent+9) << "dummy1 = " << setprecision(indent) << m_dummy1 << '\n'; + if (HasOptionalField(e_progIndParam)) + strm << setw(indent+15) << "progIndParam = " << setprecision(indent) << m_progIndParam << '\n'; if (HasOptionalField(e_callMgrParam)) strm << setw(indent+15) << "callMgrParam = " << setprecision(indent) << m_callMgrParam << '\n'; if (HasOptionalField(e_callSignallingParam)) @@ -800,10 +800,10 @@ BOOL CISCO_H225_H323_UU_NonStdInfo::Decode(PASN_Stream & strm) return FALSE; if (HasOptionalField(e_commonParam) && !m_commonParam.Decode(strm)) return FALSE; - if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam)) - return FALSE; if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1)) return FALSE; + if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam)) + return FALSE; if (!KnownExtensionDecode(strm, e_callMgrParam, m_callMgrParam)) return FALSE; if (!KnownExtensionDecode(strm, e_callSignallingParam, m_callSignallingParam)) @@ -827,8 +827,8 @@ void CISCO_H225_H323_UU_NonStdInfo::Encode(PASN_Stream & strm) const m_protoParam.Encode(strm); if (HasOptionalField(e_commonParam)) m_commonParam.Encode(strm); - KnownExtensionEncode(strm, e_progIndParam, m_progIndParam); KnownExtensionEncode(strm, e_dummy1, m_dummy1); + KnownExtensionEncode(strm, e_progIndParam, m_progIndParam); KnownExtensionEncode(strm, e_callMgrParam, m_callMgrParam); KnownExtensionEncode(strm, e_callSignallingParam, m_callSignallingParam); KnownExtensionEncode(strm, e_dummy2, m_dummy2); |