<!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][15121] </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=15121">15121</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-08 12:43:51 -0500 (Thu, 08 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>move accidental new behaviour behind new param originate_continue_on_timeout=true</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc">freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.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="freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (15120 => 15121)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-10-08 17:15:01 UTC (rev 15120)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-10-08 17:43:51 UTC (rev 15121)
</span><span class="lines">@@ -1595,12 +1595,10 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_APP(att_xfer_function)
</span><span class="cx"> {
</span><del>- const char *var;
</del><span class="cx"> switch_core_session_t *peer_session = NULL;
</span><span class="cx"> switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
</span><span class="cx"> switch_channel_t *channel, *peer_channel = NULL;
</span><span class="cx"> const char *bond = NULL;
</span><del>- int timelimit = 60;
</del><span class="cx"> switch_core_session_t *b_session = NULL;
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -1612,11 +1610,7 @@
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_SOFT_HOLDING_UUID_VARIABLE, bond);
</span><span class="cx"> switch_channel_set_flag(channel, CF_XFER_ZOMBIE);
</span><span class="cx">
</span><del>- if ((var = switch_channel_get_variable(channel, SWITCH_CALL_TIMEOUT_VARIABLE))) {
- timelimit = atoi(var);
- }
-
- if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL, NULL, SOF_NONE)
</del><ins>+ if (switch_ivr_originate(session, &peer_session, &cause, data, 0, NULL, NULL, NULL, NULL, NULL, SOF_NONE)
</ins><span class="cx"> != SWITCH_STATUS_SUCCESS || !peer_session) {
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -2125,22 +2119,17 @@
</span><span class="cx"> {
</span><span class="cx"> switch_channel_t *caller_channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_core_session_t *peer_session = NULL;
</span><del>- unsigned int timelimit = 60;
- const char *var, *continue_on_fail = NULL, *failure_causes = NULL;
</del><ins>+ const char *continue_on_fail = NULL, *failure_causes = NULL;
</ins><span class="cx"> switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(data)) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((var = switch_channel_get_variable(caller_channel, SWITCH_CALL_TIMEOUT_VARIABLE))) {
- timelimit = atoi(var);
- }
-
</del><span class="cx"> continue_on_fail = switch_channel_get_variable(caller_channel, "continue_on_fail");
</span><span class="cx"> failure_causes = switch_channel_get_variable(caller_channel, "failure_causes");
</span><span class="cx">
</span><del>- if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_ivr_originate(session, &peer_session, &cause, data, 0, NULL, NULL, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Originate Failed. Cause: %s\n", switch_channel_cause2str(cause));
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -2258,11 +2247,11 @@
</span><span class="cx"> switch_originate_flag_t myflags = SOF_NONE;
</span><span class="cx"> char *cid_name_override = NULL;
</span><span class="cx"> char *cid_num_override = NULL;
</span><del>- const char *var, *skip = NULL;
- unsigned int timelimit = 60;
</del><span class="cx"> char *domain = NULL;
</span><span class="cx"> switch_channel_t *new_channel = NULL;
</span><del>-
</del><ins>+ unsigned int timelimit = 60;
+ const char *skip, *var;
+
</ins><span class="cx"> group = strdup(outbound_profile->destination_number);
</span><span class="cx">
</span><span class="cx"> if (!group) goto done;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (15120 => 15121)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-10-08 17:15:01 UTC (rev 15120)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-10-08 17:43:51 UTC (rev 15121)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> int monitor_early_media_ring_count;
</span><span class="cx"> int monitor_early_media_ring_total;
</span><span class="cx"> int cancel_timeout;
</span><ins>+ int continue_on_timeout;
</ins><span class="cx"> } originate_global_t;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -755,7 +756,7 @@
</span><span class="cx"> switch_core_session_set_read_codec(session, &write_codec);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (ringback_data) {
</span><span class="cx"> char *tmp_data = NULL;
</span><span class="cx">
</span><span class="lines">@@ -1033,10 +1034,16 @@
</span><span class="cx"> switch_channel_state_t wait_state = 0;
</span><span class="cx">
</span><span class="cx"> if (session) {
</span><ins>+ const char *to_var;
</ins><span class="cx"> caller_channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_channel_set_flag(caller_channel, CF_ORIGINATOR);
</span><span class="cx"> oglobals.session = session;
</span><span class="cx">
</span><ins>+
+ if ((to_var = switch_channel_get_variable(caller_channel, SWITCH_CALL_TIMEOUT_VARIABLE))) {
+ timelimit_sec = atoi(to_var);
+ }
+
</ins><span class="cx"> if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_PROXY_MEDIA_VARIABLE))) {
</span><span class="cx"> switch_channel_set_flag(caller_channel, CF_PROXY_MEDIA);
</span><span class="cx"> }
</span><span class="lines">@@ -1060,6 +1067,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (timelimit_sec <= 0) {
+ timelimit_sec = 60;
+ }
+
</ins><span class="cx">
</span><span class="cx"> oglobals.idx = IDX_NADA;
</span><span class="cx"> oglobals.early_ok = 1;
</span><span class="lines">@@ -1193,6 +1204,8 @@
</span><span class="cx"> ok = 1;
</span><span class="cx"> } else if (!strcasecmp((char *) hi->name, "ignore_early_media")) {
</span><span class="cx"> ok = 1;
</span><ins>+ } else if (!strcasecmp((char *) hi->name, "originate_continue_on_timeout")) {
+ ok = 1;
</ins><span class="cx"> } else if (!strcasecmp((char *) hi->name, "ignore_ring_ready")) {
</span><span class="cx"> ok = 1;
</span><span class="cx"> } else if (!strcasecmp((char *) hi->name, "monitor_early_media_ring")) {
</span><span class="lines">@@ -1296,6 +1309,10 @@
</span><span class="cx"> oglobals.ignore_early_media = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((var_val = switch_event_get_header(var_event, "originate_continue_on_timeout")) && switch_true(var_val)) {
+ oglobals.continue_on_timeout = 1;
+ }
+
</ins><span class="cx"> if ((var_val = switch_event_get_header(var_event, "ignore_ring_ready")) && switch_true(var_val)) {
</span><span class="cx"> oglobals.ignore_ring_ready = 1;
</span><span class="cx"> }
</span><span class="lines">@@ -2145,7 +2162,7 @@
</span><span class="cx"> switch_core_session_reset(oglobals.session, SWITCH_FALSE, SWITCH_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((oglobals.idx == IDX_TIMEOUT || oglobals.idx == IDX_KEY_CANCEL) && switch_channel_ready(caller_channel)) {
</del><ins>+ if ((oglobals.idx == IDX_TIMEOUT || oglobals.idx == IDX_KEY_CANCEL) && (caller_channel && switch_channel_ready(caller_channel))) {
</ins><span class="cx"> holding = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2465,6 +2482,10 @@
</span><span class="cx"> if (ok) {
</span><span class="cx"> goto outer_for;
</span><span class="cx"> }
</span><ins>+
+ if (to && !oglobals.continue_on_timeout) {
+ goto outer_for;
+ }
</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>