<!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][14247] </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=14247">14247</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-07-14 12:19:14 -0500 (Tue, 14 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>group_confirm_cancel_timeout=true to stop timers once a group_confirm is triggered <a href="http://jira.freeswitch.org/browse/LIST-001">LIST-001</a> <a href="http://jira.freeswitch.org/browse/RAY-007">RAY-007</a> <a href="http://jira.freeswitch.org/browse/IRC-1234">IRC-1234</a></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 (14246 => 14247)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-07-14 16:15:50 UTC (rev 14246)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-07-14 17:19:14 UTC (rev 14247)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> uint8_t ignore_ring_ready;
</span><span class="cx"> int monitor_early_media_ring_count;
</span><span class="cx"> int monitor_early_media_ring_total;
</span><ins>+ int cancel_timeout;
</ins><span class="cx"> } originate_global_t;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -228,6 +229,10 @@
</span><span class="cx"> int x = 0,i;
</span><span class="cx"> time_t elapsed = switch_epoch_time_now(NULL) - start;
</span><span class="cx">
</span><ins>+ if (oglobals->cancel_timeout > 0) {
+ return 0;
+ }
+
</ins><span class="cx"> for (i = 0; i < max; i++) {
</span><span class="cx"> if (originate_status[i].peer_channel && originate_status[i].per_channel_delay_start && elapsed > originate_status[i].per_channel_delay_start) {
</span><span class="cx"> switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
</span><span class="lines">@@ -508,6 +513,10 @@
</span><span class="cx"> if (!switch_strlen_zero(oglobals->key)) {
</span><span class="cx"> struct key_collect *collect;
</span><span class="cx">
</span><ins>+ if (oglobals->cancel_timeout < 0) {
+ oglobals->cancel_timeout = 1;
+ }
+
</ins><span class="cx"> if ((collect = switch_core_session_alloc(originate_status[i].peer_session, sizeof(*collect)))) {
</span><span class="cx"> switch_channel_set_flag(originate_status[i].peer_channel, CF_TAGGED);
</span><span class="cx"> if (!switch_strlen_zero(oglobals->key)) {
</span><span class="lines">@@ -1047,6 +1056,8 @@
</span><span class="cx"> ok = 1;
</span><span class="cx"> } else if (!strcasecmp((char *) hi->name, "group_confirm_file")) {
</span><span class="cx"> ok = 1;
</span><ins>+ } else if (!strcasecmp((char *) hi->name, "group_confirm_clear_timeout")) {
+ ok = 1;
</ins><span class="cx"> } else if (!strcasecmp((char *) hi->name, "forked_dial")) {
</span><span class="cx"> ok = 1;
</span><span class="cx"> } else if (!strcasecmp((char *) hi->name, "fail_on_single_reject")) {
</span><span class="lines">@@ -1123,6 +1134,10 @@
</span><span class="cx"> oglobals.early_ok = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_true(switch_event_get_header(var_event, "group_confirm_cancel_timeout"))) {
+ oglobals.cancel_timeout = -1;
+ }
+
</ins><span class="cx"> if ((var = switch_event_get_header(var_event, "group_confirm_key"))) {
</span><span class="cx"> switch_copy_string(oglobals.key, var, sizeof(oglobals.key));
</span><span class="cx"> if ((var = switch_event_get_header(var_event, "group_confirm_file"))) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>