<!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][16877] </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=16877">16877</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-03-03 01:58:43 -0600 (Wed, 03 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: fixed <a href="http://jira.freeswitch.org/browse/MODSKYPIAX-73">MODSKYPIAX-73</a>, and manage when REMOTEHOLD hangs up</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (16876 => 16877)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-03-03 07:49:59 UTC (rev 16876)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-03-03 07:58:43 UTC (rev 16877)
</span><span class="lines">@@ -448,12 +448,20 @@
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_core_timer_destroy(&tech_pvt->timer_read);
</del><ins>+ if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+ switch_core_timer_destroy(&tech_pvt->timer_read);
+ }
</ins><span class="cx">
</span><del>- switch_core_timer_destroy(&tech_pvt->timer_write);
</del><ins>+ if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+ switch_core_timer_destroy(&tech_pvt->timer_write);
+ }
</ins><span class="cx">
</span><del>- switch_buffer_destroy(&tech_pvt->read_buffer);
- switch_buffer_destroy(&tech_pvt->write_buffer);
</del><ins>+ if(tech_pvt->read_buffer){
+ switch_buffer_destroy(&tech_pvt->read_buffer);
+ }
+ if(tech_pvt->write_buffer){
+ switch_buffer_destroy(&tech_pvt->write_buffer);
+ }
</ins><span class="cx">
</span><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
</span><span class="lines">@@ -570,23 +578,20 @@
</span><span class="cx"> DEBUGA_SKYPE("%s CHANNEL KILL_CHANNEL\n", SKYPIAX_P_LOG, tech_pvt->name);
</span><span class="cx"> switch (sig) {
</span><span class="cx"> case SWITCH_SIG_KILL:
</span><ins>+ switch_mutex_lock(tech_pvt->flag_mutex);
</ins><span class="cx"> DEBUGA_SKYPE("%s CHANNEL got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
</span><del>- switch_mutex_lock(tech_pvt->flag_mutex);
- switch_clear_flag(tech_pvt, TFLAG_IO);
- switch_clear_flag(tech_pvt, TFLAG_VOICE);
- switch_set_flag(tech_pvt, TFLAG_HANGUP);
</del><span class="cx"> if (tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD) {
</span><del>- ERRORA("FYI %s CHANNEL in CALLFLOW_STATUS_REMOTEHOLD got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
- channel_on_hangup(session);
</del><ins>+ DEBUGA_SKYPE("FYI %s CHANNEL in CALLFLOW_STATUS_REMOTEHOLD got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
</ins><span class="cx"> }
</span><span class="cx"> if (switch_channel_get_state(channel) == CS_NEW) {
</span><span class="cx"> ERRORA("FYI %s CHANNEL in CS_NEW state got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
</span><del>- channel_on_hangup(session);
</del><span class="cx"> }
</span><span class="cx"> if (switch_channel_get_state(channel) != CS_NEW && switch_channel_get_state(channel) < CS_EXECUTE) {
</span><span class="cx"> ERRORA("FYI %s CHANNEL in %d state got SWITCH_SIG_KILL\n", SKYPIAX_P_LOG, switch_channel_get_name(channel), switch_channel_get_state(channel));
</span><del>- channel_on_hangup(session);
</del><span class="cx"> }
</span><ins>+ switch_clear_flag(tech_pvt, TFLAG_IO);
+ switch_clear_flag(tech_pvt, TFLAG_VOICE);
+ switch_set_flag(tech_pvt, TFLAG_HANGUP);
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->flag_mutex);
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_SIG_BREAK:
</span><span class="lines">@@ -679,7 +684,9 @@
</span><span class="cx"> tech_pvt->read_frame.flags = SFF_NONE;
</span><span class="cx"> *frame = NULL;
</span><span class="cx">
</span><del>- switch_core_timer_next(&tech_pvt->timer_read);
</del><ins>+ if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+ switch_core_timer_next(&tech_pvt->timer_read);
+ }
</ins><span class="cx">
</span><span class="cx"> read:
</span><span class="cx">
</span><span class="lines">@@ -872,14 +879,18 @@
</span><span class="cx"> if(tech_pvt->read_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> switch_buffer_zero(tech_pvt->read_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
</del><ins>+ if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(tech_pvt->write_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> switch_buffer_zero(tech_pvt->write_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+ if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("Synching audio\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -893,14 +904,18 @@
</span><span class="cx"> if(tech_pvt->read_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> switch_buffer_zero(tech_pvt->read_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
</del><ins>+ if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(tech_pvt->write_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> switch_buffer_zero(tech_pvt->write_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+ if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("Synching audio\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -911,14 +926,18 @@
</span><span class="cx"> if(tech_pvt->read_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> switch_buffer_zero(tech_pvt->read_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
</del><ins>+ if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(tech_pvt->write_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> switch_buffer_zero(tech_pvt->write_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+ if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("Synching audio\n", SKYPIAX_P_LOG);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (16876 => 16877)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-03-03 07:49:59 UTC (rev 16876)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-03-03 07:58:43 UTC (rev 16877)
</span><span class="lines">@@ -506,14 +506,18 @@
</span><span class="cx"> if(tech_pvt->read_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> switch_buffer_zero(tech_pvt->read_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
</del><ins>+ if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(tech_pvt->write_buffer){
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> switch_buffer_zero(tech_pvt->write_buffer);
</span><del>- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+ if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next){
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ }
</ins><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> }
</span><span class="cx"> DEBUGA_SKYPE("Synching audio on skype_call: %s.\n", SKYPIAX_P_LOG, id);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>