<!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][15346] </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=15346">15346</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-11-04 08:37:13 -0600 (Wed, 04 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>It's now possible to return ACTIONS = { { "log", "NOTICE message from script" }, { "answer" }, "info" }</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribledrlualua_dialplandiff">freeswitch/trunk/contrib/ledr/lua/lua_dialplan.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribledrlualua_dialplandiff"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/ledr/lua/lua_dialplan.diff (15345 => 15346)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/lua/lua_dialplan.diff 2009-11-04 11:55:45 UTC (rev 15345)
+++ freeswitch/trunk/contrib/ledr/lua/lua_dialplan.diff 2009-11-04 14:37:13 UTC (rev 15346)
</span><span class="lines">@@ -1,18 +1,21 @@
</span><span class="cx"> Index: src/mod/languages/mod_lua/mod_lua.cpp
</span><span class="cx"> ===================================================================
</span><del>---- src/mod/languages/mod_lua/mod_lua.cpp (revision 15327)
</del><ins>+--- src/mod/languages/mod_lua/mod_lua.cpp (revision 15341)
</ins><span class="cx"> +++ src/mod/languages/mod_lua/mod_lua.cpp (working copy)
</span><del>-@@ -461,10 +461,80 @@
</del><ins>+@@ -461,10 +461,126 @@
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++void logger(int i, char *s) {
++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, ">>>>> %i L=[%s]\n", i, s);
++}
++
</ins><span class="cx"> +SWITCH_STANDARD_DIALPLAN(lua_dialplan_hunt)
</span><span class="cx"> +{
</span><span class="cx"> + lua_State *L = lua_init();
</span><span class="cx"> + switch_caller_extension_t *extension = NULL;
</span><span class="cx"> + switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> + char *cmd;
</span><del>-+ char *str;
</del><span class="cx"> +
</span><span class="cx"> + if (!caller_profile) {
</span><span class="cx"> + if (!(caller_profile = switch_channel_get_caller_profile(channel))) {
</span><span class="lines">@@ -39,36 +42,79 @@
</span><span class="cx"> + mod_lua_conjure_session(L, session, "session", 1);
</span><span class="cx"> + lua_parse_and_execute(L, cmd);
</span><span class="cx"> +
</span><del>-+ /* expecting APPS = { "application1", "app_data1", "application2", "app_data2", "application3" } */
-+ lua_getfield(L, LUA_GLOBALSINDEX, "APPS");
-+ if (lua_istable(L, 1)) {
-+ lua_pushnil(L); /* first key */
-+ while (lua_next(L, 1) != 0) {
-+ /* uses 'key' (at index -2) and 'value' (at index -1) */
-+ if (lua_isstring(L, -1)) {
-+ char *application;
-+ char *app_data;
-+ application = strdup(lua_tostring(L, -1));
</del><ins>++ /* expecting ACTIONS = { {"app1", "app_data1"}, { "app2" }, "app3" } -- each of three is valid */
++ lua_getfield(L, LUA_GLOBALSINDEX, "ACTIONS");
++ if (!lua_istable(L, 1)) {
++ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
++ "Global variable ACTIONS may only be a table\n");
++ goto done;
++ }
++
++ lua_pushnil(L); /* STACK = tab | nil */
++
++ while (lua_next(L, 1) != 0) { /* STACK = tab | k1 .. kn | vn */
++ char *application, *app_data;
++
++ if (lua_isstring(L, -1)) {
++ application = strdup(lua_tostring(L, -1));
++ app_data = strdup("");
++
++ } else if (lua_istable(L, -1)) {
++ int i = lua_gettop(L);
++
++ lua_pushnil(L); /* STACK = tab1 | k1 .. kn | tab2 | nil */
++
++ if (lua_next(L, i) != 0) { /* STACK = tab1 | k1 .. kn | tab2 | k | v */
++
++ if (!lua_isstring(L, -1)) {
++ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
++ "First element in each table in the ACTIONS table may only be a string - application name\n");
++ goto rollback;
++ }
++
++ application = strdup(lua_tostring(L, -1));
++
</ins><span class="cx"> + lua_pop(L, 1);
</span><del>-+ if (lua_next(L, 1) != 0) {
-+ if (lua_isstring(L, -1)) {
-+ app_data = strdup(lua_tostring(L, -1));
-+ } else {
-+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Each app_data must be returned as a string!\n");
</del><ins>++
++ if (lua_next(L, i) == 0) { /* STACK = tab1 | k1 .. kn | tab2 | k | k | v */
++ app_data = strdup("");
++
++ } else {
++ if (!lua_isstring(L, -1)) {
++ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
++ "Second (optional) element in each table in the ACTIONS table may only be a string - app_data\n");
++ free(application);
++ goto rollback;
</ins><span class="cx"> + }
</span><ins>++ app_data = strdup(lua_tostring(L, -1));
</ins><span class="cx"> + }
</span><del>-+ switch_caller_extension_add_application(session, extension, application, app_data);
-+ switch_safe_free(app_data);
-+ switch_safe_free(application);
-+ } else {
-+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Each application must be returned as a string!\n");
</del><ins>++
</ins><span class="cx"> + }
</span><del>-+ /* removes 'value'; keeps 'key' for next iteration */
-+ lua_pop(L, 1);
</del><ins>++
++ lua_settop(L, i); /* STACK = tab1 | k1 .. kn | tab2 */
++
++ } else {
++ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
++ "ACTIONS table may only contain strings or tables\n");
++ goto rollback;
</ins><span class="cx"> + }
</span><span class="cx"> +
</span><ins>++ switch_caller_extension_add_application(session, extension, application, app_data);
++ free(app_data);
++ free(application);
++
++ lua_pop(L, 1);
</ins><span class="cx"> + }
</span><span class="cx"> +
</span><ins>++ /* all went fine */
++ goto done;
++
++ rollback:
++ /* extension was created on session's memory pool, so make a new, empty one here */
++ if ((extension = switch_caller_extension_new(session, "_anon_", caller_profile->destination_number)) == 0) {
++ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
++ }
++
</ins><span class="cx"> + done:
</span><span class="cx"> + switch_safe_free(cmd);
</span><span class="cx"> + lua_uninit(L);
</span><span class="lines">@@ -83,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> /* connect my internal structure to the blank pointer passed to me */
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><del>-@@ -472,6 +542,7 @@
</del><ins>+@@ -472,6 +588,7 @@
</ins><span class="cx"> SWITCH_ADD_API(api_interface, "luarun", "run a script", luarun_api_function, "<script>");
</span><span class="cx"> SWITCH_ADD_API(api_interface, "lua", "run a script as an api function", lua_api_function, "<script>");
</span><span class="cx"> SWITCH_ADD_APP(app_interface, "lua", "Launch LUA ivr", "Run a lua ivr on a channel", lua_function, "<script>", SAF_SUPPORT_NOMEDIA);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>