kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tweak 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8206 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-04-26 15:57:05 +00:00
parent 5743b7e152
commit 2a3bf6897a
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mod/languages/mod_perl/mod_perl.c
View File

@ -56,17 +56,17 @@ static struct {
char *xml_handler;
} globals;
static void Perl_safe_eval(PerlInterpreter *my_perl, const char *string, int tf)
static int Perl_safe_eval(PerlInterpreter *my_perl, const char *string, int tf)
{
char *st = switch_mprintf("eval { %s }; $__ERR = $@", string);
char *err = NULL;
Perl_eval_pv(my_perl, st, tf);
if ((err = SvPV(get_sv("__ERR", FALSE), n_a)) && !switch_strlen_zero(err)) {
Perl_eval_pv(my_perl, string, FALSE);
if ((err = SvPV(get_sv("@", TRUE), n_a)) && !switch_strlen_zero(err)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", err);
return -1;
}
switch_safe_free(st);
return 0;
}
static void destroy_perl(PerlInterpreter ** to_destroy)
@ -90,18 +90,29 @@ static perl_parse_and_execute (PerlInterpreter *my_perl, char *input_code, char
if (*input_code == '~') {
char *buff = input_code + 1;
perl_parse(my_perl, xs_init, 3, embedding, NULL);
if (setup_code) Perl_safe_eval(my_perl, setup_code, TRUE);
if (setup_code) Perl_safe_eval(my_perl, setup_code, FALSE);
Perl_safe_eval(my_perl, buff, TRUE);
} else {
int argc = 0;
char *argv[128] = { 0 };
char *err;
argv[0] = "FreeSWITCH";
argc++;
argc += switch_separate_string(input_code, ' ', &argv[1], (sizeof(argv) / sizeof(argv[0])) - 1);
perl_parse(my_perl, xs_init, argc, argv, (char **)NULL);
if (setup_code) Perl_safe_eval(my_perl, setup_code, TRUE);
perl_run(my_perl);
if (!perl_parse(my_perl, xs_init, argc, argv, (char **)NULL)) {
if (setup_code) {
if (!Perl_safe_eval(my_perl, setup_code, FALSE)) {
perl_run(my_perl);
}
}
}
if ((err = SvPV(get_sv("@", TRUE), n_a)) && !switch_strlen_zero(err)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", err);
}
}
}
@ -122,8 +133,8 @@ static void perl_function(switch_core_session_t *session, char *data)
uuid);
perl_parse_and_execute(my_perl, data, code);
Perl_safe_eval(my_perl, "undef $session;", TRUE);
Perl_safe_eval(my_perl, "undef (*);", TRUE);
Perl_safe_eval(my_perl, "undef $session;", FALSE);
Perl_safe_eval(my_perl, "undef (*);", FALSE);
destroy_perl(&my_perl);
}
@ -157,7 +168,7 @@ static void *SWITCH_THREAD_FUNC perl_thread_run(switch_thread_t *thread, void *o
free(input_code);
}
Perl_safe_eval(my_perl, "undef(*);", TRUE);
Perl_safe_eval(my_perl, "undef(*);", FALSE);
destroy_perl(&my_perl);
return NULL;
@ -207,25 +218,25 @@ SWITCH_STANDARD_API(perl_api_function) {
);
perl_parse(my_perl, xs_init, 3, embedding, NULL);
Perl_safe_eval(my_perl, code, TRUE);
Perl_safe_eval(my_perl, code, FALSE);
if (uuid) {
switch_snprintf(code, sizeof(code), "$session = new freeswitch::Session(\"%s\")", uuid);
Perl_safe_eval(my_perl, code, TRUE);
Perl_safe_eval(my_perl, code, FALSE);
}
if (cmd) {
Perl_safe_eval(my_perl, cmd, TRUE);
Perl_safe_eval(my_perl, cmd, FALSE);
}
stream->write_function(stream, "%s", switch_str_nil(SvPV(get_sv("__OUT", FALSE), n_a)));
if (uuid) {
switch_snprintf(code, sizeof(code), "undef $session;", uuid);
Perl_safe_eval(my_perl, code, TRUE);
Perl_safe_eval(my_perl, code, FALSE);
}
Perl_safe_eval(my_perl, "undef(*);", TRUE);
Perl_safe_eval(my_perl, "undef(*);", FALSE);
destroy_perl(&my_perl);
return SWITCH_STATUS_SUCCESS;
@ -315,7 +326,7 @@ static switch_xml_t perl_fetch(const char *section,
,
SWITCH_GLOBAL_dirs.base_dir
);
Perl_safe_eval(my_perl, code, TRUE);
Perl_safe_eval(my_perl, code, FALSE);
perl_run(my_perl);
str = SvPV(get_sv("XML_STRING", FALSE), n_a);

14
src/mod/languages/mod_perl/mod_perl_wrap.cpp
View File

@ -3361,7 +3361,7 @@ XS(_wrap_CoreSession_preAnswer) {
XS(_wrap_CoreSession_hangup) {
{
CoreSession *arg1 = (CoreSession *) 0 ;
char *arg2 = (char *) 0 ;
char *arg2 = (char *) "normal_clearing" ;
void *argp1 = 0 ;
int res1 = 0 ;
int res2 ;
@ -3370,7 +3370,7 @@ XS(_wrap_CoreSession_hangup) {
int argvi = 0;
dXSARGS;
if ((items < 2) || (items > 2)) {
if ((items < 1) || (items > 2)) {
SWIG_croak("Usage: CoreSession_hangup(self,cause);");
}
res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 | 0 );
@ -3378,11 +3378,13 @@ XS(_wrap_CoreSession_hangup) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_hangup" "', argument " "1"" of type '" "CoreSession *""'");
}
arg1 = reinterpret_cast< CoreSession * >(argp1);
res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_hangup" "', argument " "2"" of type '" "char *""'");
if (items > 1) {
res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_hangup" "', argument " "2"" of type '" "char *""'");
}
arg2 = reinterpret_cast< char * >(buf2);
}
arg2 = reinterpret_cast< char * >(buf2);
(arg1)->hangup(arg2);