<!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][16480] </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=16480">16480</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-01-23 12:35:05 -0600 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> fix some bypass media scenarios </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_bridgec">freeswitch/trunk/src/switch_ivr_bridge.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2010-01-23 16:16:54 UTC (rev 16479)
+++ freeswitch/trunk/src/include/switch_core.h 2010-01-23 18:35:05 UTC (rev 16480)
</span><span class="lines">@@ -2071,6 +2071,7 @@
</span><span class="cx"> SWITCH_DECLARE(uint32_t) switch_core_debug_level(void);
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_flush_handles(void);
</span><span class="cx"> SWITCH_DECLARE(const char *) switch_core_banner(void);
</span><ins>+SWITCH_DECLARE(switch_bool_t) switch_core_session_in_thread(switch_core_session_t *session);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2010-01-23 16:16:54 UTC (rev 16479)
+++ freeswitch/trunk/src/switch_core_session.c 2010-01-23 18:35:05 UTC (rev 16480)
</span><span class="lines">@@ -1141,6 +1141,14 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_bool_t) switch_core_session_in_thread(switch_core_session_t *session)
+{
+ if (switch_thread_self() == session->thread_id) {
+ return SWITCH_TRUE;
+ }
+ return SWITCH_FALSE;
+}
+
</ins><span class="cx"> static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><span class="cx"> switch_core_session_t *session = obj;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2010-01-23 16:16:54 UTC (rev 16479)
+++ freeswitch/trunk/src/switch_ivr.c 2010-01-23 18:35:05 UTC (rev 16480)
</span><span class="lines">@@ -1286,7 +1286,9 @@
</span><span class="cx"> if (other_channel) {
</span><span class="cx"> switch_channel_wait_for_state(other_channel, channel, CS_PARK);
</span><span class="cx"> }
</span><del>- switch_channel_wait_for_state_timeout(channel, CS_PARK, 5000000);
</del><ins>+ if (switch_core_session_in_thread(session)) {
+ switch_yield(100000);
+ }
</ins><span class="cx">
</span><span class="cx"> switch_channel_clear_flag(channel, CF_NOT_READY);
</span><span class="cx">
</span><span class="lines">@@ -1300,7 +1302,9 @@
</span><span class="cx"> switch_ivr_signal_bridge(session, other_session);
</span><span class="cx"> }
</span><span class="cx"> switch_channel_wait_for_state(other_channel, channel, CS_HIBERNATE);
</span><del>- switch_channel_wait_for_state(channel, other_channel, CS_HIBERNATE);
</del><ins>+ if (switch_core_session_in_thread(session)) {
+ switch_yield(100000);
+ }
</ins><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_bridgec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_bridge.c (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_bridge.c 2010-01-23 16:16:54 UTC (rev 16479)
+++ freeswitch/trunk/src/switch_ivr_bridge.c 2010-01-23 18:35:05 UTC (rev 16480)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include <switch.h>
</span><del>-#define DEFAULT_LEAD_FRAMES 5
</del><ins>+#define DEFAULT_LEAD_FRAMES 10
</ins><span class="cx">
</span><span class="cx"> static const switch_state_handler_table_t audio_bridge_peer_state_handlers;
</span><span class="cx"> static void cleanup_proxy_mode_a(switch_core_session_t *session);
</span><span class="lines">@@ -839,18 +839,22 @@
</span><span class="cx"> switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL);
</span><span class="cx">
</span><span class="cx"> if (switch_channel_up(other_channel)) {
</span><ins>+
</ins><span class="cx"> if (switch_true(switch_channel_get_variable(other_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) {
</span><span class="cx"> switch_ivr_park_session(other_session);
</span><span class="cx"> } else if ((var = switch_channel_get_variable(other_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) {
</span><span class="cx"> transfer_after_bridge(other_session, var);
</span><span class="cx"> }
</span><del>-
- if (switch_channel_test_flag(other_channel, CF_BRIDGE_ORIGINATOR) &&
- switch_channel_test_flag(channel, CF_ANSWERED) &&
- switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) {
- switch_channel_hangup(other_channel, switch_channel_get_cause(channel));
</del><ins>+
+ if (switch_channel_test_flag(other_channel, CF_BRIDGE_ORIGINATOR)) {
+ if (switch_channel_test_flag(channel, CF_ANSWERED) &&
+ switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) {
+ switch_channel_hangup(other_channel, switch_channel_get_cause(channel));
+ } else {
+ switch_channel_set_state(other_channel, CS_EXECUTE);
+ }
</ins><span class="cx"> } else {
</span><del>- switch_channel_set_state(other_channel, CS_EXECUTE);
</del><ins>+ switch_channel_hangup(other_channel, switch_channel_get_cause(channel));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>