<!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][16553] </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=16553">16553</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-02 10:20:12 -0600 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-545">FSCORE-545</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="freeswitchtrunksrcswitch_ivr_bridgec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_bridge.c (16552 => 16553)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_bridge.c 2010-02-02 15:16:28 UTC (rev 16552)
+++ freeswitch/trunk/src/switch_ivr_bridge.c 2010-02-02 16:20:12 UTC (rev 16553)
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx">
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_UUID_BRIDGE, NULL);
</span><span class="cx">
</span><del>- switch_channel_wait_for_state(channel, other_channel, CS_RESET);
</del><ins>+ switch_channel_wait_for_state(other_channel, channel, CS_RESET);
</ins><span class="cx">
</span><span class="cx"> if (switch_ivr_wait_for_answer(session, other_session) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx"> switch_channel_set_state(other_channel, CS_SOFT_EXECUTE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_channel_wait_for_state(channel, other_channel, CS_SOFT_EXECUTE);
</del><ins>+ switch_channel_wait_for_state(other_channel, channel, CS_SOFT_EXECUTE);
</ins><span class="cx">
</span><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx">
</span><span class="lines">@@ -833,15 +833,41 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static switch_status_t hanguphook(switch_core_session_t *session)
+{
+ switch_core_session_message_t msg = { 0 };
+ switch_channel_t *channel = NULL;
</ins><span class="cx">
</span><ins>+ channel = switch_core_session_get_channel(session);
+
+ msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
+ msg.from = __FILE__;
+ msg.string_arg = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE);
+
+ switch_core_session_receive_message(session, &msg);
+ switch_core_event_hook_remove_state_change(session, hanguphook);
+
+ return SWITCH_STATUS_SUCCESS;
+
+}
+
</ins><span class="cx"> static switch_status_t signal_bridge_on_hibernate(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> const char *key;
</span><ins>+ switch_core_session_message_t msg = { 0 };
</ins><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_assert(channel != NULL);
</span><span class="cx">
</span><ins>+ msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE;
+ msg.from = __FILE__;
+ msg.string_arg = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE);
+
+ switch_core_event_hook_add_state_change(session, hanguphook);
+
+ switch_core_session_receive_message(session, &msg);
+
</ins><span class="cx"> if ((key = switch_channel_get_variable(channel, "bridge_terminate_key"))) {
</span><span class="cx"> switch_channel_set_private(channel, "__bridge_term_key", switch_core_session_strdup(session, key));
</span><span class="cx"> switch_core_event_hook_add_recv_dtmf(session, sb_on_dtmf);
</span><span class="lines">@@ -1180,7 +1206,7 @@
</span><span class="cx"> switch_xml_t cdr;
</span><span class="cx"> char *xml_text;
</span><span class="cx">
</span><del>- switch_channel_wait_for_state(caller_channel, peer_channel, CS_DESTROY);
</del><ins>+ switch_channel_wait_for_state(peer_channel, caller_channel, CS_DESTROY);
</ins><span class="cx">
</span><span class="cx"> if (switch_ivr_generate_xml_cdr(peer_session, &cdr) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>