<!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][15145] </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=15145">15145</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-12 18:35:51 -0500 (Mon, 12 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add auto ext type and support for being called from bind_meta_app to valet_parking (needs some more)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_valet_parkingmod_valet_parkingc">freeswitch/trunk/src/mod/applications/mod_valet_parking/mod_valet_parking.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_valet_parkingmod_valet_parkingc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_valet_parking/mod_valet_parking.c (15144 => 15145)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_valet_parking/mod_valet_parking.c 2009-10-12 23:27:01 UTC (rev 15144)
+++ freeswitch/trunk/src/mod/applications/mod_valet_parking/mod_valet_parking.c 2009-10-12 23:35:51 UTC (rev 15145)
</span><span class="lines">@@ -80,7 +80,25 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static int next_id(valet_lot_t *lot)
+{
+ int i, r = 0;
+ char buf[128] = "";
</ins><span class="cx">
</span><ins>+ switch_mutex_lock(globals.mutex);
+ for(i = 1 ;; i++) {
+ switch_snprintf(buf, sizeof(buf), "%d", i);
+ if (!switch_core_hash_find(lot->hash, buf)) {
+ r = i;
+ break;
+ }
+ }
+ switch_mutex_unlock(globals.mutex);
+
+ return r;
+}
+
+
</ins><span class="cx"> #define VALET_APP_SYNTAX "<lotname> <extension>|[ask [<min>] [<max>] [<to>] [<prompt>]]"
</span><span class="cx"> SWITCH_STANDARD_APP(valet_parking_function)
</span><span class="cx"> {
</span><span class="lines">@@ -88,13 +106,15 @@
</span><span class="cx"> int argc;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_event_t *event;
</span><ins>+ char dtmf_buf[128] = "";
+
</ins><span class="cx">
</span><span class="cx"> if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data))
</span><span class="cx"> && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 2) {
</span><span class="cx"> char *lot_name = argv[0];
</span><span class="cx"> char *ext = argv[1];
</span><span class="cx"> valet_lot_t *lot;
</span><del>- char *uuid;
</del><ins>+ const char *uuid;
</ins><span class="cx"> const char *music = "silence";
</span><span class="cx"> const char *tmp = NULL;
</span><span class="cx"> switch_status_t status;
</span><span class="lines">@@ -104,10 +124,12 @@
</span><span class="cx">
</span><span class="cx"> lot = valet_find_lot(lot_name);
</span><span class="cx"> switch_assert(lot);
</span><del>-
- if (!strcasecmp(ext, "ask")) {
</del><ins>+
+ if (!strcasecmp(ext, "auto")) {
+ switch_snprintf(dtmf_buf, sizeof(dtmf_buf), "%d", next_id(lot));
+ ext = dtmf_buf;
+ } else if (!strcasecmp(ext, "ask")) {
</ins><span class="cx"> const char *prompt = "ivr/ivr-enter_ext_pound.wav";
</span><del>- char dtmf_buf[12] = "";
</del><span class="cx"> int min = 1;
</span><span class="cx"> int max = 11;
</span><span class="cx"> int to = 10000;
</span><span class="lines">@@ -169,6 +191,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ dest = switch_core_session_sprintf(session, "valet_park:%s %s", lot_name, ext);
+ switch_channel_set_variable(channel, "inline_destination", dest);
+
+ if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) {
+ switch_core_session_t *b_session;
+ if ((b_session = switch_core_session_locate(uuid))) {
+ const char *lang = switch_channel_get_variable(channel, "language");
+ if (!lang) {
+ lang = "en";
+ }
+ switch_ivr_session_transfer(b_session, dest, "inline", NULL);
+ switch_mutex_unlock(lot->mutex);
+ switch_core_session_rwunlock(b_session);
+ //maybe a phrase here for more flexibility
+ switch_ivr_say(session, ext, lang, "name_spelled", "pronounced", NULL);
+ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+ return;
+ }
+ }
+
</ins><span class="cx">
</span><span class="cx"> if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, VALET_EVENT) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Valet-Lot-Name", lot_name);
</span><span class="lines">@@ -177,9 +220,6 @@
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dest = switch_core_session_sprintf(session, "valet_park:%s %s", lot_name, ext);
- switch_channel_set_variable(channel, "inline_destination", dest);
-
</del><span class="cx">
</span><span class="cx"> if (!(tmp = switch_channel_get_variable(channel, "valet_hold_music"))) {
</span><span class="cx"> tmp = switch_channel_get_variable(channel, "hold_music");
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>