November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6255 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 10:16:03 2007 New Revision: 6255 Modified: freeswitch/trunk/src/switch_regex.c Log: update Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Wed Nov 14 10:16:03 2007 @@ -68,12 +68,14 @@ return 0; } - if (*expression == '/' && *(expression + (strlen(expression) - 1)) == '/') { + if (*expression == '/') { char *opts = NULL; tmp = strdup(expression + 1); assert(tmp); if ((opts = strrchr(tmp, '/'))) { *opts++ = '\0'; + } else { + goto end; } expression = tmp; if (opts) { @@ -86,6 +88,7 @@ } } + re = pcre_compile(expression, /* the pattern */ flags, /* default options */ &error, /* for error message */

1 0

[commit] r6254 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 09:18:24 2007 New Revision: 6254 Modified: freeswitch/trunk/src/switch_regex.c Log: add opts to regex Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Wed Nov 14 09:18:24 2007 @@ -61,20 +61,40 @@ int erroffset = 0; pcre *re = NULL; int match_count = 0; + char *tmp = NULL; + uint32_t flags = 0; if (!(field && expression)) { return 0; } + if (*expression == '/' && *(expression + (strlen(expression) - 1)) == '/') { + char *opts = NULL; + tmp = strdup(expression + 1); + assert(tmp); + if ((opts = strrchr(tmp, '/'))) { + *opts++ = '\0'; + } + expression = tmp; + if (opts) { + if (strchr(opts, 'i')) { + flags |= PCRE_CASELESS; + } + if (strchr(opts, 's')) { + flags |= PCRE_DOTALL; + } + } + } + re = pcre_compile(expression, /* the pattern */ - 0, /* default options */ + flags, /* default options */ &error, /* for error message */ &erroffset, /* for error offset */ NULL); /* use default character tables */ if (error) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "COMPILE ERROR: %d [%s]\n", erroffset, error); switch_regex_safe_free(re); - return 0; + goto end; } match_count = pcre_exec(re, /* result of pcre_compile() */ @@ -93,6 +113,8 @@ *new_re = (switch_regex_t *) re; + end: + switch_safe_free(tmp); return match_count; }

1 0

[commit] r6253 - freeswitch/trunk/libs/js/nsprpub/pr/include/private
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: mikej Date: Tue Nov 13 19:01:51 2007 New Revision: 6253 Modified: freeswitch/trunk/libs/js/nsprpub/pr/include/private/primpl.h Log: build fix for OS X 10.5 Modified: freeswitch/trunk/libs/js/nsprpub/pr/include/private/primpl.h ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/include/private/primpl.h (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/include/private/primpl.h Tue Nov 13 19:01:51 2007 @@ -54,6 +54,10 @@ #include <kernel/OS.h> #endif +#ifdef DARWIN +#include <signal.h> +#endif + #ifdef WINNT /* Need to force service-pack 3 extensions to be defined by ** setting _WIN32_WINNT to NT 4.0 for winsock.h, winbase.h, winnt.h.

1 0

[commit] r6252 - freeswitch/trunk/src/mod/applications/mod_expr
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Tue Nov 13 18:24:36 2007 New Revision: 6252 Modified: freeswitch/trunk/src/mod/applications/mod_expr/exprincl.h Log: don't directly include malloc.h, it doesn't exist on some platforms Modified: freeswitch/trunk/src/mod/applications/mod_expr/exprincl.h ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/exprincl.h (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/exprincl.h Tue Nov 13 18:24:36 2007 @@ -32,7 +32,7 @@ #endif /* Memory allocation */ -#include <malloc.h> +#include <stdlib.h> /* String routines */ #include <string.h>

1 0

[commit] r6251 - freeswitch/trunk/src/mod/applications/mod_expr
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Tue Nov 13 18:18:52 2007 New Revision: 6251 Modified: freeswitch/trunk/src/mod/applications/mod_expr/Makefile Log: fix build error on OsX 10.5 Modified: freeswitch/trunk/src/mod/applications/mod_expr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/Makefile Tue Nov 13 18:18:52 2007 @@ -1,6 +1,6 @@ BASE=../../../.. LOCAL_SOURCES=expreval.c exprinit.c exprobj.c exprutil.c exprfunc.c exprmem.c exprpars.c exprval.c LOCAL_OBJS=expreval.o exprinit.o exprobj.o exprutil.o exprfunc.o exprmem.o exprpars.o exprval.o -LOCAL_LIBADD=-lm +LOCAL_LDFLAGS=-lm include $(BASE)/build/modmake.rules

1 0

[commit] r6250 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Tue Nov 13 18:12:34 2007 New Revision: 6250 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: fix sun studio build Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Tue Nov 13 18:12:34 2007 @@ -13,8 +13,9 @@ MRCP_APR_INCLUDES = -I../../../../libs/apr/include MRCP_APU_INCLUDES = -I../../../../libs/apr-util/include -LOCAL_CFLAGS= -Wno-unused -LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) +#do not specify gcc specific compiler flags +#LOCAL_CFLAGS= -Wno-unused -Wno-comment -Wno-sign-compare +LOCAL_CFLAGS= $(OPENMRCP_INCLUDE) $(MRCP_APR_INCLUDES) $(MRCP_APU_INCLUDES) LOCAL_LIBADD=$(OPENMRCP_LIBS) Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Tue Nov 13 18:12:34 2007 @@ -56,6 +56,7 @@ #pragma warning (disable:188) #endif +#include <switch.h> #include "openmrcp_client.h" #include "mrcp_client_context.h" @@ -63,7 +64,6 @@ #include "mrcp_synthesizer.h" #include "mrcp_generic_header.h" -#include <switch.h> SWITCH_MODULE_LOAD_FUNCTION(mod_openmrcp_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openmrcp_shutdown);

1 0

[commit] r6249 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Tue Nov 13 17:06:44 2007 New Revision: 6249 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: fix some stuff and add set_user func Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Nov 13 17:06:44 2007 @@ -372,6 +372,7 @@ limit_execute_sql(sql, NULL); switch_safe_free(sql); stream->write_function(stream, "+OK"); + goto done; } else if (!strcasecmp(argv[0], "select")) { char buf[256] = ""; callback_t cbt = { 0 };

1 0

[commit] r6248 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Tue Nov 13 17:05:02 2007 New Revision: 6248 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: fix some stuff and add set_user func Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Nov 13 17:05:02 2007 @@ -349,7 +349,7 @@ goto error; } - if (!strcasecmp(argv[0], "set")) { + if (!strcasecmp(argv[0], "insert")) { if (argc < 4) { goto error; } @@ -363,7 +363,16 @@ switch_safe_free(sql); stream->write_function(stream, "+OK"); goto done; - } else if (!strcasecmp(argv[0], "get")) { + } else if (!strcasecmp(argv[0], "delete")) { + if (argc < 2) { + goto error; + } + sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + assert(sql); + limit_execute_sql(sql, NULL); + switch_safe_free(sql); + stream->write_function(stream, "+OK"); + } else if (!strcasecmp(argv[0], "select")) { char buf[256] = ""; callback_t cbt = { 0 }; if (argc < 3) {

1 0

[commit] r6247 - in freeswitch/trunk/libs/curl: . lib
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Tue Nov 13 17:04:42 2007 New Revision: 6247 Modified: freeswitch/trunk/libs/curl/configure.ac freeswitch/trunk/libs/curl/lib/config.h.in Log: fix qwirk in solaris build Modified: freeswitch/trunk/libs/curl/configure.ac ============================================================================== --- freeswitch/trunk/libs/curl/configure.ac (original) +++ freeswitch/trunk/libs/curl/configure.ac Tue Nov 13 17:04:42 2007 @@ -417,6 +417,15 @@ dnl socket lib? AC_CHECK_FUNC(connect, , [ AC_CHECK_LIB(socket, connect) ]) +AC_CHECK_LIB(socket, socket, + [HAVE_SOCKET="1" + LIBS="$LIBS -lsocket" + ]) + +if test "$HAVE_SOCKET" = "1"; then + AC_DEFINE(HAVE_SOCKET, 1, [If you have socket]) +fi + dnl dl lib? AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ]) Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Tue Nov 13 17:04:42 2007 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of `curl_off_t', as computed by sizeof. */ +/* The size of a `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of `long', as computed by sizeof. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `size_t', as computed by sizeof. */ +/* The size of a `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of a `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */

1 0

[commit] r6246 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Tue Nov 13 17:03:05 2007 New Revision: 6246 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: fix some stuff and add set_user func Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Nov 13 17:03:05 2007 @@ -408,7 +408,7 @@ mydata = switch_core_session_strdup(session, data); argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); } - printf("WTF [%s] %d\n", argv[0], argc); + if (argc < 4) { goto error; }

1 0