[asterisk-commits] pcadach: trunk r43853 - in /trunk: ./
channels/h323/ main/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Sep 28 04:12:59 MST 2006
Author: pcadach
Date: Thu Sep 28 06:12:58 2006
New Revision: 43853
URL: http://svn.digium.com/view/asterisk?rev=43853&view=rev
Log:
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
........
Modified:
trunk/ (props changed)
trunk/channels/h323/ast_h323.cxx
trunk/channels/h323/cisco-h225.asn
trunk/channels/h323/cisco-h225.cxx
trunk/channels/h323/cisco-h225.h
trunk/main/file.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/ast_h323.cxx?rev=43853&r1=43852&r2=43853&view=diff
==============================================================================
--- trunk/channels/h323/ast_h323.cxx (original)
+++ trunk/channels/h323/ast_h323.cxx Thu Sep 28 06:12:58 2006
@@ -1432,6 +1432,10 @@
const H245_H2250LogicalChannelParameters * /*param*/,
RTP_QOS * /*param*/ )
{
+ /* Do not open tx channel when transmitter has been paused by empty TCS */
+ if ((dir == H323Channel::IsTransmitter) && transmitterSidePaused)
+ return NULL;
+
return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID);
}
Modified: trunk/channels/h323/cisco-h225.asn
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/cisco-h225.asn?rev=43853&r1=43852&r2=43853&view=diff
==============================================================================
--- trunk/channels/h323/cisco-h225.asn (original)
+++ trunk/channels/h323/cisco-h225.asn Thu Sep 28 06:12:58 2006
@@ -7,8 +7,8 @@
protoParam ProtoParam OPTIONAL,
commonParam CommonParam OPTIONAL,
...,
+ dummy1 OCTET STRING OPTIONAL,
progIndParam ProgIndParam OPTIONAL,
- dummy1 OCTET STRING OPTIONAL,
callMgrParam CallMgrParam OPTIONAL,
callSignallingParam CallSignallingParam OPTIONAL,
dummy2 OCTET STRING OPTIONAL,
Modified: trunk/channels/h323/cisco-h225.cxx
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/cisco-h225.cxx?rev=43853&r1=43852&r2=43853&view=diff
==============================================================================
--- trunk/channels/h323/cisco-h225.cxx (original)
+++ trunk/channels/h323/cisco-h225.cxx Thu Sep 28 06:12:58 2006
@@ -739,10 +739,10 @@
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_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_dummy1))
- strm << setw(indent+9) << "dummy1 = " << setprecision(indent) << m_dummy1 << '\n';
if (HasOptionalField(e_callMgrParam))
strm << setw(indent+15) << "callMgrParam = " << setprecision(indent) << m_callMgrParam << '\n';
if (HasOptionalField(e_callSignallingParam))
@@ -800,9 +800,9 @@
return FALSE;
if (HasOptionalField(e_commonParam) && !m_commonParam.Decode(strm))
return FALSE;
+ if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1))
+ return FALSE;
if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam))
- return FALSE;
- if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1))
return FALSE;
if (!KnownExtensionDecode(strm, e_callMgrParam, m_callMgrParam))
return FALSE;
@@ -827,8 +827,8 @@
m_protoParam.Encode(strm);
if (HasOptionalField(e_commonParam))
m_commonParam.Encode(strm);
+ KnownExtensionEncode(strm, e_dummy1, m_dummy1);
KnownExtensionEncode(strm, e_progIndParam, m_progIndParam);
- KnownExtensionEncode(strm, e_dummy1, m_dummy1);
KnownExtensionEncode(strm, e_callMgrParam, m_callMgrParam);
KnownExtensionEncode(strm, e_callSignallingParam, m_callSignallingParam);
KnownExtensionEncode(strm, e_dummy2, m_dummy2);
Modified: trunk/channels/h323/cisco-h225.h
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/cisco-h225.h?rev=43853&r1=43852&r2=43853&view=diff
==============================================================================
--- trunk/channels/h323/cisco-h225.h (original)
+++ trunk/channels/h323/cisco-h225.h Thu Sep 28 06:12:58 2006
@@ -262,8 +262,8 @@
e_version,
e_protoParam,
e_commonParam,
+ e_dummy1,
e_progIndParam,
- e_dummy1,
e_callMgrParam,
e_callSignallingParam,
e_dummy2,
@@ -273,8 +273,8 @@
PASN_Integer m_version;
CISCO_H225_ProtoParam m_protoParam;
CISCO_H225_CommonParam m_commonParam;
+ PASN_OctetString m_dummy1;
CISCO_H225_ProgIndParam m_progIndParam;
- PASN_OctetString m_dummy1;
CISCO_H225_CallMgrParam m_callMgrParam;
CISCO_H225_CallSignallingParam m_callSignallingParam;
PASN_OctetString m_dummy2;
Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?rev=43853&r1=43852&r2=43853&view=diff
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Thu Sep 28 06:12:58 2006
@@ -1056,11 +1056,14 @@
case AST_CONTROL_RINGING:
case AST_CONTROL_ANSWER:
case AST_CONTROL_VIDUPDATE:
+ case AST_CONTROL_HOLD:
+ case AST_CONTROL_UNHOLD:
/* Unimportant */
break;
default:
ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", fr->subclass);
}
+ break;
case AST_FRAME_VOICE:
/* Write audio if appropriate */
if (audiofd > -1)
More information about the asterisk-commits
mailing list