<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15935] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15935">15935</a></dd>
<dt>Author</dt> <dd>bottleman</dd>
<dt>Date</dt> <dd>2009-12-12 08:39:44 -0600 (Sat, 12 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix slow start handling</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_h323changestxt">freeswitch/trunk/src/mod/endpoints/mod_h323/changes.txt</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_h323mod_h323cpp">freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_h323mod_h323h">freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_h323changestxt"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_h323/changes.txt (15934 => 15935)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_h323/changes.txt 2009-12-12 03:34:43 UTC (rev 15934)
+++ freeswitch/trunk/src/mod/endpoints/mod_h323/changes.txt 2009-12-12 14:39:44 UTC (rev 15935)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+fix slow start handling
</ins><span class="cx"> move faststart to callproceeding due to some broken hardware not anderstand
</span><span class="cx"> correclty faststart in progress.
</span><span class="cx"> fix rtp timer initialisation.
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_h323mod_h323cpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.cpp (15934 => 15935)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.cpp 2009-12-12 03:34:43 UTC (rev 15934)
+++ freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.cpp 2009-12-12 14:39:44 UTC (rev 15935)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- Version 0.0.17
</del><ins>+ Version 0.0.18
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "mod_h323.h"
</span><span class="lines">@@ -786,8 +786,23 @@
</span><span class="cx"> H323SignalPDU callProceedingPDU;
</span><span class="cx"> H225_CallProceeding_UUIE & callProceeding = callProceedingPDU.BuildCallProceeding(*this);
</span><span class="cx">
</span><del>- if (SendFastStartAcknowledge(callProceeding.m_fastStart))
</del><ins>+ if (SendFastStartAcknowledge(callProceeding.m_fastStart)){
</ins><span class="cx"> callProceeding.IncludeOptionalField(H225_CallProceeding_UUIE::e_fastStart);
</span><ins>+ } else {
+ PTRACE(2, "H323\tSendFastStartAcknowledge = FALSE ");
+ if (connectionState == ShuttingDownConnection){
+ return true;
+ }
+ earlyStart = TRUE;
+ if (!h245Tunneling && (controlChannel == NULL)) {
+ if (!StartControlChannel()){
+ return true;
+ }
+ callProceeding.IncludeOptionalField(H225_CallProceeding_UUIE::e_h245Address);
+ controlChannel->SetUpTransportPDU(callProceeding.m_h245Address, TRUE);
+ }
+ }
+
</ins><span class="cx"> if (!WriteSignalPDU(callProceedingPDU))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -984,6 +999,8 @@
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_SIG_KILL:
</span><span class="cx"> default:
</span><ins>+ m_rxAudioOpened.Signal();
+ m_txAudioOpened.Signal();
</ins><span class="cx"> if (switch_rtp_ready(tech_pvt->rtp_session)) {
</span><span class="cx"> switch_rtp_kill_socket(tech_pvt->rtp_session);
</span><span class="cx"> }
</span><span class="lines">@@ -1038,37 +1055,48 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (msg->message_id) {
</span><del>- case SWITCH_MESSAGE_INDICATE_RINGING:{
</del><ins>+ case SWITCH_MESSAGE_INDICATE_RINGING: {
</ins><span class="cx"> AnsweringCall(AnswerCallPending);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case SWITCH_MESSAGE_INDICATE_DEFLECT:{
</del><ins>+ case SWITCH_MESSAGE_INDICATE_DEFLECT: {
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case SWITCH_MESSAGE_INDICATE_PROGRESS:{
</del><ins>+ case SWITCH_MESSAGE_INDICATE_PROGRESS: {
</ins><span class="cx"> AnsweringCall(AnswerCallPending);
</span><span class="cx"> AnsweringCall(AnswerCallDeferredWithMedia);
</span><span class="cx">
</span><del>- if (m_txChennel && m_rxChennel)
</del><ins>+ if (m_txChennel && m_rxChennel){
</ins><span class="cx"> if (!switch_channel_test_flag(m_fsChannel, CF_EARLY_MEDIA)) {
</span><span class="cx"> switch_channel_mark_pre_answered(m_fsChannel);
</span><span class="cx"> }
</span><del>- else m_callOnPreAnswer = true;
</del><ins>+ } else {
+ m_callOnPreAnswer = true;
+ if (fastStartState == FastStartDisabled){
+ m_txAudioOpened.Wait();
+ }
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case SWITCH_MESSAGE_INDICATE_ANSWER:{
</del><ins>+ case SWITCH_MESSAGE_INDICATE_ANSWER: {
</ins><span class="cx"> if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx"> AnsweringCall(H323Connection::AnswerCallNow);
</span><span class="cx"> PTRACE(4, "mod_h323\tMedia started on connection " << *this);
</span><span class="cx">
</span><del>- if (m_txChennel && m_rxChennel)
</del><ins>+ if (m_txChennel && m_rxChennel){
</ins><span class="cx"> if (!switch_channel_test_flag(m_fsChannel, CF_EARLY_MEDIA)) {
</span><span class="cx"> PTRACE(4, "mod_h323\t-------------------->switch_channel_mark_answered(m_fsChannel) " << *this);
</span><span class="cx"> switch_channel_mark_answered(m_fsChannel);
</span><span class="cx"> }
</span><del>- else m_ChennelAnswer = true;
</del><ins>+ } else{
+ m_ChennelAnswer = true;
+ if (fastStartState == FastStartDisabled){
+ m_txAudioOpened.Wait();
+ m_rxAudioOpened.Wait();
+ }
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:{
</span><span class="lines">@@ -1393,7 +1421,7 @@
</span><span class="cx"> PTRACE(4, "mod_h323\t------------------->samples_per_packet = "<<m_switchCodec->implementation->samples_per_packet);
</span><span class="cx"> PTRACE(4, "mod_h323\t------------------->actual_samples_per_second = "<<m_switchCodec->implementation->actual_samples_per_second);
</span><span class="cx">
</span><del>- if ((!m_conn->m_startRTP)&&(GetDirection() == IsReceiver)) {
</del><ins>+ if ((!m_conn->m_startRTP)) {
</ins><span class="cx"> flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_DATAWAIT|SWITCH_RTP_FLAG_AUTO_CNG|SWITCH_RTP_FLAG_RAW_WRITE);
</span><span class="cx"> PTRACE(4, "mod_h323\t------------------->timer_name = "<<switch_channel_get_variable(m_fsChannel, "timer_name"));
</span><span class="cx"> if ((var = switch_channel_get_variable(m_fsChannel, "timer_name"))) {
</span><span class="lines">@@ -1425,6 +1453,10 @@
</span><span class="cx">
</span><span class="cx"> PTRACE(4, "mod_h323\t------------->External RTP address "<<m_RTPremoteIP<<":"<<m_RTPremotePort);
</span><span class="cx"> switch_mutex_unlock(tech_pvt->h323_mutex);
</span><ins>+
+ if (GetDirection() == IsReceiver) m_conn->m_rxAudioOpened.Signal();
+ else m_conn->m_txAudioOpened.Signal();
+
</ins><span class="cx"> if ( m_conn->m_ChennelAnswer && m_conn->m_rxChennel && m_conn->m_txChennel)
</span><span class="cx"> switch_channel_mark_answered(m_fsChannel);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_h323mod_h323h"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.h (15934 => 15935)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.h 2009-12-12 03:34:43 UTC (rev 15934)
+++ freeswitch/trunk/src/mod/endpoints/mod_h323/mod_h323.h 2009-12-12 14:39:44 UTC (rev 15935)
</span><span class="lines">@@ -261,6 +261,8 @@
</span><span class="cx"> bool m_txChennel;
</span><span class="cx"> bool m_ChennelAnswer;
</span><span class="cx"> bool m_ChennelProgress;
</span><ins>+ PSyncPoint m_rxAudioOpened;
+ PSyncPoint m_txAudioOpened;
</ins><span class="cx"> protected:
</span><span class="cx"> FSH323EndPoint * m_endpoint;
</span><span class="cx"> PString m_remoteAddr;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>