<!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][14969] </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=14969">14969</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-24 17:21:44 -0500 (Thu, 24 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add i flag to bind_meta_app to do inline execute of the app (not wise to use unless app returns instantly)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc">freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_asyncc">freeswitch/trunk/src/switch_ivr_async.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (14968 => 14969)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-09-24 21:07:47 UTC (rev 14968)
+++ freeswitch/trunk/src/include/switch_types.h 2009-09-24 22:21:44 UTC (rev 14969)
</span><span class="lines">@@ -194,7 +194,8 @@
</span><span class="cx"> SBF_EXEC_BLEG = (1 << 3),
</span><span class="cx"> SBF_EXEC_OPPOSITE = (1 << 4),
</span><span class="cx"> SBF_EXEC_SAME = (1 << 5),
</span><del>- SBF_ONCE = (1 << 6)
</del><ins>+ SBF_ONCE = (1 << 6),
+ SBF_EXEC_INLINE = (1 << 7)
</ins><span class="cx"> } switch_bind_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_bind_flag_t;
</span><span class="cx">
</span><span class="lines">@@ -318,7 +319,8 @@
</span><span class="cx"> SMF_FORCE = (1 << 3),
</span><span class="cx"> SMF_LOOP = (1 << 4),
</span><span class="cx"> SMF_HOLD_BLEG = (1 << 5),
</span><del>- SMF_IMMEDIATE = (1 << 6)
</del><ins>+ SMF_IMMEDIATE = (1 << 6),
+ SMF_EXEC_INLINE = (1 << 7)
</ins><span class="cx"> } switch_media_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_media_flag_t;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (14968 => 14969)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-09-24 21:07:47 UTC (rev 14968)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-09-24 22:21:44 UTC (rev 14969)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#define BIND_SYNTAX "<key> [a|b|ab] [a|b|o|s|1] <app>"
</del><ins>+#define BIND_SYNTAX "<key> [a|b|ab] [a|b|o|s|i|1] <app>"
</ins><span class="cx"> SWITCH_STANDARD_APP(dtmf_bind_function)
</span><span class="cx"> {
</span><span class="cx"> char *argv[4] = { 0 };
</span><span class="lines">@@ -242,6 +242,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (strchr(argv[2], 'i')) {
+ bind_flags |= SBF_EXEC_INLINE;
+ }
+
</ins><span class="cx"> if (strchr(argv[2], 'o')) {
</span><span class="cx"> if ((bind_flags & SBF_EXEC_BLEG) || (bind_flags & SBF_EXEC_ALEG) || (bind_flags & SBF_EXEC_SAME)) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_asyncc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_async.c (14968 => 14969)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2009-09-24 21:07:47 UTC (rev 14968)
+++ freeswitch/trunk/src/switch_ivr_async.c 2009-09-24 22:21:44 UTC (rev 14969)
</span><span class="lines">@@ -2031,6 +2031,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> flags |= SMF_ECHO_ALEG;
</span><span class="cx"> }
</span><ins>+ } else if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_INLINE)) {
+ flags |= SMF_EXEC_INLINE;
</ins><span class="cx"> } else if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_ALEG)) {
</span><span class="cx"> flags |= SMF_ECHO_ALEG;
</span><span class="cx"> } else if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_BLEG)) {
</span><span class="lines">@@ -2684,7 +2686,11 @@
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hold-bleg", "true");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_core_session_queue_private_event(other_session, &event);
</del><ins>+ if ((flags & SMF_EXEC_INLINE)) {
+ switch_core_session_execute_application(other_session, app, path);
+ } else {
+ switch_core_session_queue_private_event(other_session, &event);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_core_session_rwunlock(other_session);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>