<!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][15368] </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=15368">15368</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-05 00:56:38 -0600 (Thu, 05 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODENDP-259">MODENDP-259</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_bridgec">freeswitch/trunk/src/switch_ivr_bridge.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (15367 => 15368)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-11-05 06:56:16 UTC (rev 15367)
+++ freeswitch/trunk/src/include/switch_types.h 2009-11-05 06:56:38 UTC (rev 15368)
</span><span class="lines">@@ -929,6 +929,7 @@
</span><span class="cx"> CF_NOT_READY,
</span><span class="cx"> CF_SIGNAL_BRIDGE_TTL,
</span><span class="cx"> CF_MEDIA_BRIDGE_TTL,
</span><ins>+ CF_HANGUP_AFTER_BRIDGE,
</ins><span class="cx"> /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
</span><span class="cx"> CF_FLAG_MAX
</span><span class="cx"> } switch_channel_flag_t;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_bridgec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_bridge.c (15367 => 15368)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_bridge.c 2009-11-05 06:56:16 UTC (rev 15367)
+++ freeswitch/trunk/src/switch_ivr_bridge.c 2009-11-05 06:56:38 UTC (rev 15368)
</span><span class="lines">@@ -793,7 +793,10 @@
</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><del>-
</del><ins>+ if (switch_channel_test_flag(other_channel, CF_HANGUP_AFTER_BRIDGE)) {
+ switch_channel_hangup(other_channel, switch_channel_get_cause(channel));
+ }
+
</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="lines">@@ -1123,6 +1126,11 @@
</span><span class="cx"> !switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE) && !a_leg->clean_exit && !inner_bridge) {
</span><span class="cx"> if ((state != CS_EXECUTE && state != CS_SOFT_EXECUTE && state != CS_PARK && state != CS_ROUTING) ||
</span><span class="cx"> (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP)) {
</span><ins>+
+ if (switch_channel_test_flag(caller_channel, CF_HANGUP_AFTER_BRIDGE)) {
+ switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel));
+ }
+
</ins><span class="cx"> if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) {
</span><span class="cx"> switch_ivr_park_session(session);
</span><span class="cx"> } else if ((var = switch_channel_get_variable(caller_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE))) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (15367 => 15368)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-11-05 06:56:16 UTC (rev 15367)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-11-05 06:56:38 UTC (rev 15368)
</span><span class="lines">@@ -2089,7 +2089,7 @@
</span><span class="cx"> goto notready;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /* read from the channel while we wait if the audio is up on it */
</span><span class="cx"> if (oglobals.session &&
</span><span class="cx"> !switch_channel_test_flag(caller_channel, CF_PROXY_MODE) &&
</span><span class="lines">@@ -2281,7 +2281,7 @@
</span><span class="cx"> const char *context = NULL;
</span><span class="cx"> const char *dialplan = NULL;
</span><span class="cx"> switch_core_session_t *holding_session;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (caller_channel) {
</span><span class="cx"> if (zstr(context)) {
</span><span class="cx"> context = switch_channel_get_variable(caller_channel, "context");
</span><span class="lines">@@ -2302,7 +2302,7 @@
</span><span class="cx"> if ((holding_session = switch_core_session_locate(holding))) {
</span><span class="cx"> switch_channel_t *holding_channel = switch_core_session_get_channel(holding_session);
</span><span class="cx"> switch_status_t mstatus = SWITCH_STATUS_FALSE;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (caller_channel) {
</span><span class="cx"> if ((mstatus = switch_channel_caller_extension_masquerade(caller_channel, holding_channel, 1)) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_channel_restart(holding_channel);
</span><span class="lines">@@ -2333,9 +2333,19 @@
</span><span class="cx"> }
</span><span class="cx"> force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER;
</span><span class="cx"> } else {
</span><ins>+
</ins><span class="cx"> if (peer_channel && switch_channel_ready(peer_channel)) {
</span><ins>+ switch_core_session_t *holding_session;
+
</ins><span class="cx"> force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER;
</span><ins>+
+ if ((holding_session = switch_core_session_locate(holding))) {
+ switch_channel_set_flag(switch_core_session_get_channel(holding_session), CF_HANGUP_AFTER_BRIDGE);
+ switch_core_session_rwunlock(holding_session);
+ }
+
</ins><span class="cx"> switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(peer_session));
</span><ins>+ holding = NULL;
</ins><span class="cx"> oglobals.idx = IDX_NADA;
</span><span class="cx"> if (caller_channel && switch_channel_up(caller_channel)) {
</span><span class="cx"> switch_channel_hangup(caller_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
</span><span class="lines">@@ -2349,8 +2359,10 @@
</span><span class="cx">
</span><span class="cx"> if ((holding_session = switch_core_session_locate(holding))) {
</span><span class="cx"> switch_channel_t *holding_channel = switch_core_session_get_channel(holding_session);
</span><ins>+
</ins><span class="cx"> if (caller_channel && switch_channel_ready(caller_channel)) {
</span><span class="cx"> switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(session));
</span><ins>+ holding = NULL;
</ins><span class="cx"> } else {
</span><span class="cx"> switch_channel_hangup(holding_channel, SWITCH_CAUSE_NORMAL_UNSPECIFIED);
</span><span class="cx"> }
</span><span class="lines">@@ -2361,7 +2373,6 @@
</span><span class="cx">
</span><span class="cx"> peer_session = NULL;
</span><span class="cx"> peer_channel = NULL;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < and_argc; i++) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>