ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-08 05:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-6241 --resolve

Browse Source
This commit is contained in:
Anthony Minessale
2014-02-20 01:25:07 +05:00
parent 020c9108a1
commit 99765fbd9a
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/languages/mod_lua/freeswitch_lua.cpp
+26 -15
View File
@@ -4,7 +4,7 @@
using namespace LUA;
extern "C" {
int docall(lua_State * L, int narg, int nresults, int perror);
int docall(lua_State * L, int narg, int nresults, int perror, int fatal);
};
Session::Session():CoreSession()
@@ -147,7 +147,7 @@ void Session::do_hangup_hook()
arg_count++;
}
docall(L, arg_count, 1, 1);
docall(L, arg_count, 1, 1, 0);
const char *err = lua_tostring(L, -1);
@@ -273,6 +273,7 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp
switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
char str[3] = "";
int arg_count = 3;
int r;
lua_getglobal(L, (char *) cb_function);
lua_getglobal(L, uuid);
@@ -294,10 +295,14 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp
arg_count++;
}
docall(L, arg_count, 1, 1);
r = docall(L, arg_count, 1, 1, 0);
ret = lua_tostring(L, -1);
lua_pop(L, 1);
if (!r) {
ret = lua_tostring(L, -1);
lua_pop(L, 1);
} else {
ret = "SCRIPT_ERROR";
}
return process_callback_result((char *) ret);
}
@@ -319,9 +324,12 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp
arg_count++;
}
docall(L, arg_count, 1, 1);
ret = lua_tostring(L, -1);
lua_pop(L, 1);
if (!docall(L, arg_count, 1, 1, 0)) {
ret = lua_tostring(L, -1);
lua_pop(L, 1);
} else {
ret = "SCRIPT_ERROR";
}
return process_callback_result((char *) ret);
}
@@ -407,14 +415,17 @@ int Dbh::query_callback(void *pArg, int argc, char **argv, char **cargv)
lua_settable(lua_fun->L, -3);
}
docall(lua_fun->L, 1, 1, 1);
ret = lua_tonumber(lua_fun->L, -1);
lua_pop(lua_fun->L, 1);
if (ret != 0) {
return 1;
}
if (docall(lua_fun->L, 1, 1, 1, 0)) {
return 1;
}
ret = lua_tonumber(lua_fun->L, -1);
lua_pop(lua_fun->L, 1);
if (ret != 0) {
return 1;
}
return 0; /* 0 to continue with next row */
}