<!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][16329] </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=16329">16329</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-15 18:41:10 -0600 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>typical rabbit hole on new features</pre>
<h3>Modified Paths</h3>
<ul>
<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="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (16328 => 16329)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2010-01-15 22:22:08 UTC (rev 16328)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-01-16 00:41:10 UTC (rev 16329)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> uint8_t ring_ready;
</span><span class="cx"> uint8_t early_media;
</span><span class="cx"> uint8_t answered;
</span><ins>+ uint8_t tagged;
</ins><span class="cx"> uint32_t per_channel_timelimit_sec;
</span><span class="cx"> uint32_t per_channel_progress_timelimit_sec;
</span><span class="cx"> uint32_t per_channel_delay_start;
</span><span class="lines">@@ -389,6 +390,24 @@
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < len; i++) {
</span><span class="cx"> switch_channel_state_t state;
</span><ins>+
+ if (originate_status[i].tagged && originate_status[i].peer_session) {
+ switch_channel_t *channel = switch_core_session_get_channel(originate_status[i].peer_session);
+ int j;
+
+ if (switch_channel_down(channel)) {
+ switch_call_cause_t cause = switch_channel_get_cause(channel);
+
+ for (j = 0; j < len; j++) {
+ channel = switch_core_session_get_channel(originate_status[j].peer_session);
+ switch_channel_hangup(channel, cause);
+ }
+ oglobals->hups = len;
+ rval = 0;
+ goto end;
+ }
+ }
+
</ins><span class="cx"> if (!(originate_status[i].peer_channel && originate_status[i].peer_session)) {
</span><span class="cx"> oglobals->hups++;
</span><span class="cx"> continue;
</span><span class="lines">@@ -1537,7 +1556,7 @@
</span><span class="cx"> int32_t sample;
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> switch_codec_t *read_codec, read_codecs[MAX_PEERS] = { { 0 } };
</span><del>- int i,x;
</del><ins>+ int i, x, ready = 0, answered = 0;
</ins><span class="cx"> int16_t *data;
</span><span class="cx"> uint32_t datalen = 0;
</span><span class="cx"> switch_status_t status;
</span><span class="lines">@@ -1547,14 +1566,22 @@
</span><span class="cx"> originate_status[i].peer_session = session;
</span><span class="cx"> switch_core_session_read_lock(session);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> while (state->ready) {
</span><span class="cx"> datalen = 0;
</span><span class="cx"> memset(mux_data, 0, sizeof(mux_data));
</span><del>-
</del><ins>+ ready = 0;
+ answered = 0;
+
</ins><span class="cx"> for(i = 0; i < MAX_PEERS && (session = originate_status[i].peer_session); i++) {
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> if (switch_channel_media_ready(channel)) {
</span><ins>+ ready++;
+
+ if (switch_channel_test_flag(channel, CF_ANSWERED)) {
+ answered++;
+ }
+
</ins><span class="cx"> if (!switch_core_codec_ready((&read_codecs[i]))) {
</span><span class="cx"> read_codec = switch_core_session_get_read_codec(session);
</span><span class="cx">
</span><span class="lines">@@ -1590,6 +1617,10 @@
</span><span class="cx"> switch_buffer_write(state->buffer, mux_data, datalen);
</span><span class="cx"> switch_mutex_unlock(state->mutex);
</span><span class="cx"> }
</span><ins>+
+ if (!ready || answered) {
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1601,6 +1632,8 @@
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ state->oglobals->early_ok = 1;
+
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2426,7 +2459,11 @@
</span><span class="cx">
</span><span class="cx"> if (originate_status[i].peer_channel) {
</span><span class="cx"> const char *vvar;
</span><del>-
</del><ins>+
+ if (switch_true(switch_channel_get_variable(originate_status[i].peer_channel, "leg_required"))) {
+ originate_status[i].tagged = 1;
+ }
+
</ins><span class="cx"> if ((vvar = switch_channel_get_variable(originate_status[i].peer_channel, "origination_callee_id_name"))) {
</span><span class="cx"> switch_channel_set_profile_var(originate_status[i].peer_channel, "callee_id_name", vvar);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>