<!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][16980] </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=16980">16980</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-12 17:49:51 -0600 (Fri, 12 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>improve group_confirm:
group_confirm_read_timeout=<ms>
group_confirm_file=<file>
group_confirm_error_file=<file>
group_confirm_key=<now can be one or more keys></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 (16979 => 16980)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2010-03-12 23:06:36 UTC (rev 16979)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-03-12 23:49:51 UTC (rev 16980)
</span><span class="lines">@@ -99,6 +99,8 @@
</span><span class="cx"> int32_t idx;
</span><span class="cx"> uint32_t hups;
</span><span class="cx"> char file[512];
</span><ins>+ char error_file[512];
+ int confirm_timeout;
</ins><span class="cx"> char key[80];
</span><span class="cx"> uint8_t early_ok;
</span><span class="cx"> uint8_t ring_ready;
</span><span class="lines">@@ -133,6 +135,8 @@
</span><span class="cx"> struct key_collect {
</span><span class="cx"> char *key;
</span><span class="cx"> char *file;
</span><ins>+ char *error_file;
+ int confirm_timeout;
</ins><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -141,7 +145,6 @@
</span><span class="cx"> struct key_collect *collect = (struct key_collect *) obj;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(collect->session);
</span><span class="cx"> char buf[10] = SWITCH_BLANK_STRING;
</span><del>- char *p, term;
</del><span class="cx"> switch_application_interface_t *application_interface = NULL;
</span><span class="cx">
</span><span class="cx"> if (collect->session) {
</span><span class="lines">@@ -157,7 +160,7 @@
</span><span class="cx"> if (!strcasecmp(collect->key, "exec")) {
</span><span class="cx"> char *data;
</span><span class="cx"> char *app_name, *app_data;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!(data = collect->file)) {
</span><span class="cx"> goto wbreak;
</span><span class="cx"> }
</span><span class="lines">@@ -194,29 +197,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (switch_channel_ready(channel)) {
</span><ins>+ switch_size_t len = strlen(collect->key);
+ const char *file = collect->file;
+ switch_status_t status;
+
</ins><span class="cx"> memset(buf, 0, sizeof(buf));
</span><span class="cx">
</span><del>- if (collect->file) {
- switch_status_t status;
- switch_input_args_t args = { 0 };
- args.buf = buf;
- args.buflen = sizeof(buf);
- status = switch_ivr_play_file(collect->session, NULL, collect->file, &args);
- if (!SWITCH_READ_ACCEPTABLE(status)) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(collect->session), SWITCH_LOG_ERROR, "%s Error Playing File!",
- switch_channel_get_name(channel));
- switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
- }
- } else {
- switch_ivr_collect_digits_count(collect->session, buf, sizeof(buf), 1, SWITCH_BLANK_STRING, &term, 0, 0, 0);
</del><ins>+ if (zstr(file)) {
+ file = "silence";
</ins><span class="cx"> }
</span><del>-
- for (p = buf; *p; p++) {
- if (*collect->key == *p) {
- switch_channel_set_flag(channel, CF_WINNER);
- goto wbreak;
- }
</del><ins>+
+ status = switch_ivr_read(collect->session,
+ len,
+ len,
+ collect->file, NULL, buf, sizeof(buf), collect->confirm_timeout, "#");
+
+
+ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_TOO_SMALL) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(collect->session), SWITCH_LOG_ERROR, "%s Error Playing File!",
+ switch_channel_get_name(channel));
+ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</ins><span class="cx"> }
</span><ins>+
+ if (!strcmp(collect->key, buf)) {
+ switch_channel_set_flag(channel, CF_WINNER);
+ goto wbreak;
+ } else if (collect->error_file) {
+ switch_ivr_play_file(collect->session, NULL, collect->error_file, NULL);
+ }
</ins><span class="cx"> }
</span><span class="cx"> wbreak:
</span><span class="cx">
</span><span class="lines">@@ -625,6 +633,16 @@
</span><span class="cx"> if (!zstr(oglobals->file)) {
</span><span class="cx"> collect->file = switch_core_session_strdup(originate_status[i].peer_session, oglobals->file);
</span><span class="cx"> }
</span><ins>+ if (!zstr(oglobals->error_file)) {
+ collect->error_file = switch_core_session_strdup(originate_status[i].peer_session, oglobals->error_file);
+ }
+
+ if (oglobals->confirm_timeout) {
+ collect->confirm_timeout = oglobals->confirm_timeout;
+ } else {
+ collect->confirm_timeout = 5000;
+ }
+
</ins><span class="cx"> switch_channel_audio_sync(originate_status[i].peer_channel);
</span><span class="cx"> collect->session = originate_status[i].peer_session;
</span><span class="cx"> launch_collect_thread(collect);
</span><span class="lines">@@ -1987,6 +2005,17 @@
</span><span class="cx"> if ((var = switch_event_get_header(var_event, "group_confirm_file"))) {
</span><span class="cx"> switch_copy_string(oglobals.file, var, sizeof(oglobals.file));
</span><span class="cx"> }
</span><ins>+ if ((var = switch_event_get_header(var_event, "group_confirm_error_file"))) {
+ switch_copy_string(oglobals.error_file, var, sizeof(oglobals.error_file));
+ }
+ if ((var = switch_event_get_header(var_event, "group_confirm_read_timeout"))) {
+ int tmp = atoi(var);
+
+ if (tmp >= 0) {
+ oglobals.confirm_timeout = tmp;
+ }
+
+ }
</ins><span class="cx"> }
</span><span class="cx"> /* When using the AND operator, the fail_on_single_reject flag may be set in order to indicate that a single
</span><span class="cx"> rejections should terminate the attempt rather than a timeout, answer, or rejection by all.
</span><span class="lines">@@ -2002,6 +2031,10 @@
</span><span class="cx"> *oglobals.file = '\0';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((*oglobals.error_file != '\0') && (!strcmp(oglobals.error_file, "undef"))) {
+ *oglobals.error_file = '\0';
+ }
+
</ins><span class="cx"> if ((var_val = switch_event_get_header(var_event, "bridge_early_media"))) {
</span><span class="cx"> if (switch_true(var_val)) {
</span><span class="cx"> oglobals.early_ok = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>