<!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][15220] </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=15220">15220</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-23 17:37:49 -0500 (Fri, 23 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add campon_stop_key and campon_announce_sound to tell the user how to force it to the end of the waiting period</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc">freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.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 (15219 => 15220)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-10-23 22:30:19 UTC (rev 15219)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-10-23 22:37:49 UTC (rev 15220)
</span><span class="lines">@@ -2054,9 +2054,29 @@
</span><span class="cx"> /* Bridge Functions */
</span><span class="cx"> /********************************************************************************/
</span><span class="cx">
</span><ins>+static switch_status_t camp_fire(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
+{
+ switch (itype) {
+ case SWITCH_INPUT_TYPE_DTMF:
+ {
+ switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
+ char *key = (char *) buf;
+
+ if (dtmf->digit == *key) {
+ return SWITCH_STATUS_BREAK;
+ }
+ }
+ default:
+ break;
+ }
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> struct camping_stake {
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> int running;
</span><ins>+ int do_xfer;
</ins><span class="cx"> const char *moh;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -2065,18 +2085,44 @@
</span><span class="cx"> struct camping_stake *stake = (struct camping_stake *) obj;
</span><span class="cx"> switch_core_session_t *session = stake->session;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(stake->session);
</span><del>- const char *moh = stake->moh;
</del><ins>+ const char *moh = stake->moh, *greet = NULL;
+ switch_input_args_t args = { 0 };
+ char dbuf[2] = "";
+ switch_status_t status = SWITCH_STATUS_FALSE;
+ const char *stop;
</ins><span class="cx">
</span><ins>+ if ((stop = switch_channel_get_variable(channel, "campon_stop_key"))) {
+ *dbuf = *stop;
+ }
+
+ args.input_callback = camp_fire;
+ args.buf = dbuf;
+ args.buflen = sizeof(dbuf);
+
</ins><span class="cx"> switch_core_session_read_lock(session);
</span><ins>+
+ /* don't set this to a local_stream:// or you will not be happy */
+ if ((greet = switch_channel_get_variable(channel, "campon_announce_sound"))) {
+ status = switch_ivr_play_file(session, NULL, greet, &args);
+ }
+
</ins><span class="cx"> while(stake->running && switch_channel_ready(channel)) {
</span><del>- if (!strcasecmp(moh, "silence")) {
- switch_ivr_collect_digits_callback(session, NULL, 0, 0);
- } else {
- switch_ivr_play_file(session, NULL, stake->moh, NULL);
</del><ins>+ if (status != SWITCH_STATUS_BREAK) {
+ if (!strcasecmp(moh, "silence")) {
+ status = switch_ivr_collect_digits_callback(session, &args, 0, 0);
+ } else {
+ status = switch_ivr_play_file(session, NULL, stake->moh, &args);
+ }
</ins><span class="cx"> }
</span><ins>+
+ if (status == SWITCH_STATUS_BREAK) {
+ switch_channel_set_flag(channel, CF_NOT_READY);
+ stake->do_xfer = 1;
+ }
</ins><span class="cx"> }
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx">
</span><ins>+ stake->running = 0;
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2087,7 +2133,7 @@
</span><span class="cx"> const char *continue_on_fail = NULL, *failure_causes = NULL,
</span><span class="cx"> *v_campon = NULL, *v_campon_retries, *v_campon_sleep, *v_campon_timeout, *v_campon_fallback_exten = NULL;
</span><span class="cx"> switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
</span><del>- int campon_retries = 100, campon_timeout = 10, campon_sleep = 10, tmp, do_xfer = 0, camping = 0, fail = 0, thread_started = 0;
</del><ins>+ int campon_retries = 100, campon_timeout = 10, campon_sleep = 10, tmp, camping = 0, fail = 0, thread_started = 0;
</ins><span class="cx"> struct camping_stake stake = { 0 };
</span><span class="cx"> const char *moh = NULL;
</span><span class="cx"> switch_thread_t *thread = NULL;
</span><span class="lines">@@ -2190,31 +2236,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (--campon_retries <= 0) {
</del><ins>+ if (--campon_retries <= 0 || stake.do_xfer) {
</ins><span class="cx"> camping = 0;
</span><del>- do_xfer = 1;
</del><ins>+ stake.do_xfer = 1;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (fail) {
</span><span class="cx"> int64_t wait = campon_sleep * 1000000;
</span><span class="cx">
</span><del>- while(wait > 0 && switch_channel_ready(caller_channel)) {
</del><ins>+ while(stake.running && wait > 0 && switch_channel_ready(caller_channel)) {
</ins><span class="cx"> switch_yield(100000);
</span><span class="cx"> wait -= 100000;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } while (camping);
</del><ins>+ } while (camping && switch_channel_ready(caller_channel));
</ins><span class="cx">
</span><span class="cx"> if (thread) {
</span><span class="cx"> stake.running = 0;
</span><span class="cx"> switch_channel_set_flag(caller_channel, CF_NOT_READY);
</span><span class="cx"> switch_thread_join(&status, thread);
</span><del>- switch_channel_clear_flag(caller_channel, CF_NOT_READY);
</del><span class="cx"> }
</span><ins>+
+ switch_channel_clear_flag(caller_channel, CF_NOT_READY);
</ins><span class="cx">
</span><del>- if (do_xfer && !zstr(v_campon_fallback_exten)) {
</del><ins>+ if (stake.do_xfer && !zstr(v_campon_fallback_exten)) {
</ins><span class="cx"> switch_ivr_session_transfer(session,
</span><span class="cx"> v_campon_fallback_exten,
</span><span class="cx"> switch_channel_get_variable(caller_channel, "campon_fallback_dialplan"),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>