- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9021 - in freeswitch/trunk: . debian
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: mikej Date: Mon Jul 14 15:16:28 2008 New Revision: 9021 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/freeswitch.spec Log: add pocketsphinx conf file to packages (FSBUILD-59 Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Jul 14 15:16:28 2008 @@ -64,6 +64,7 @@ /opt/freeswitch/conf/autoload_configs/iax.conf.xml /opt/freeswitch/conf/autoload_configs/woomera.conf.xml /opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +/opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml /opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Jul 14 15:16:28 2008 @@ -105,6 +105,7 @@ opt/freeswitch/conf/autoload_configs/iax.conf.xml opt/freeswitch/conf/autoload_configs/woomera.conf.xml opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Mon Jul 14 15:16:28 2008 @@ -316,6 +316,7 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/logfile.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/modules.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/openmrcp.conf.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/pocketsphinx.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/portaudio.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/post_load_modules.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/rss.conf.xml

1 0

[commit] r9020 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: brian Date: Mon Jul 14 14:07:44 2008 New Revision: 9020 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: woops left a debug in there Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Mon Jul 14 14:07:44 2008 @@ -264,7 +264,6 @@ /* only feed ps_process_raw when we are listening */ if (ps->listening) { switch_mutex_lock(ps->flag_mutex); - printf("."); rv = ps_process_raw(ps->ps, (int16 *)data, len / 2 , FALSE, FALSE); switch_mutex_unlock(ps->flag_mutex); }

1 0

[commit] r9019 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: brian Date: Mon Jul 14 14:05:27 2008 New Revision: 9019 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: don't feed ps_process_raw if we are trying to grab the results.. it causes it to freak out Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Mon Jul 14 14:05:27 2008 @@ -261,10 +261,13 @@ if (switch_test_flag(ah, SWITCH_ASR_FLAG_CLOSED)) return SWITCH_STATUS_BREAK; if (!switch_test_flag(ps, PSFLAG_HAS_TEXT) && switch_test_flag(ps, PSFLAG_READY)) { - - switch_mutex_lock(ps->flag_mutex); - rv = ps_process_raw(ps->ps, (int16 *)data, len / 2 , FALSE, FALSE); - switch_mutex_unlock(ps->flag_mutex); + /* only feed ps_process_raw when we are listening */ + if (ps->listening) { + switch_mutex_lock(ps->flag_mutex); + printf("."); + rv = ps_process_raw(ps->ps, (int16 *)data, len / 2 , FALSE, FALSE); + switch_mutex_unlock(ps->flag_mutex); + } if (rv < 0) { return SWITCH_STATUS_FALSE;

1 0

[commit] r9018 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: brian Date: Mon Jul 14 13:47:34 2008 New Revision: 9018 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: invalid option Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Mon Jul 14 13:47:34 2008 @@ -138,7 +138,6 @@ ps->config = cmd_ln_init(ps->config, ps_args(), FALSE, "-samprate", "8000", - "-adcin", "yes", "-hmm", model, "-lm", lm, "-dict", dic,

1 0

[commit] r9017 - in freeswitch/trunk/src: . include mod/loggers/mod_console
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: mikej Date: Mon Jul 14 13:09:47 2008 New Revision: 9017 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/switch_log.c Log: tweak colors on windows to match unix Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jul 14 13:09:47 2008 @@ -38,6 +38,14 @@ #include <switch.h> SWITCH_BEGIN_EXTERN_C #define SWITCH_BLANK_STRING "" +#ifdef WIN32 +#define SWITCH_SEQ_FWHITE FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY +#define SWITCH_SEQ_FRED FOREGROUND_RED | FOREGROUND_INTENSITY +#define SWITCH_SEQ_FMAGEN FOREGROUND_BLUE | FOREGROUND_RED +#define SWITCH_SEQ_FCYAN FOREGROUND_GREEN | FOREGROUND_BLUE +#define SWITCH_SEQ_FGREEN FOREGROUND_GREEN +#define SWITCH_SEQ_FYELLOW FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY +#else #define SWITCH_SEQ_ESC "\033[" /* Ansi Control character suffixes */ #define SWITCH_SEQ_HOME_CHAR 'H' @@ -91,6 +99,7 @@ #define SWITCH_SEQ_CLEARLINE SWITCH_SEQ_ESC SWITCH_SEQ_CLEARLINE_CHAR_STR #define SWITCH_SEQ_CLEARLINEEND SWITCH_SEQ_ESC SWITCH_SEQ_CLEARLINEEND_CHAR #define SWITCH_SEQ_CLEARSCR SWITCH_SEQ_ESC SWITCH_SEQ_CLEARSCR_CHAR SWITCH_SEQ_HOME +#endif #define SWITCH_DEFAULT_DTMF_DURATION 2000 #define SWITCH_MAX_DTMF_DURATION 192000 #define SWITCH_DEFAULT_DIR_PERMS SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_UEXECUTE | SWITCH_FPROT_GREAD | SWITCH_FPROT_GEXECUTE Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Mon Jul 14 13:09:47 2008 @@ -42,21 +42,13 @@ static HANDLE hStdout; static WORD wOldColorAttrs; static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; -static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY -}; + +static WORD #else -static const char *COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, - SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" -}; +static const char* #endif +COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW }; + static switch_memory_pool_t *module_pool = NULL; static switch_hash_t *log_hash = NULL; Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Jul 14 13:09:47 2008 @@ -68,22 +68,12 @@ static HANDLE hStdout; static WORD wOldColorAttrs; static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; -static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY -}; + +static WORD #else -static const char *COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, - SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" -}; +static const char* #endif - +COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW }; SWITCH_DECLARE(const char *) switch_log_level2str(switch_log_level_t level) {

1 0

[commit] r9016 - freeswitch/trunk/src
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: anthm Date: Mon Jul 14 12:32:56 2008 New Revision: 9016 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_utils.c Log: fix MODAPP-113 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jul 14 12:32:56 2008 @@ -700,6 +700,8 @@ switch_mutex_lock(runtime.global_mutex); switch_inet_pton(AF_INET, ip_str, &ip); + ip = htonl(ip); + if ((list = switch_core_hash_find(IP_LIST.hash, list_name))) { ok = switch_network_list_validate_ip(list, ip); } else if (strchr(list_name, '/')) { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Jul 14 12:32:56 2008 @@ -169,7 +169,10 @@ bits = atoi(bit_str); switch_inet_pton(AF_INET, host, ip); - *mask = 0xFFFFFFFF & ~(0xFFFFFFFF << bits); + *ip = htonl(*ip); + + *mask = 0xFFFFFFFF & ~(0xFFFFFFFF >> bits); + *bitp = bits; return 0;

1 0

[commit] r9015 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: brian Date: Mon Jul 14 11:38:44 2008 New Revision: 9015 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Log: include session in hangup hook Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Mon Jul 14 11:38:44 2008 @@ -86,7 +86,7 @@ { if (hh && !mark) { const char *err = NULL; - int arg_count = 1; + int arg_count = 2; mark++; if (!getLUA()) { @@ -94,6 +94,7 @@ } lua_getfield(L, LUA_GLOBALSINDEX, (char *) hangup_func_str); + lua_getfield(L, LUA_GLOBALSINDEX, uuid); lua_pushstring(L, hook_state == CS_HANGUP ? "hangup" : "transfer");

1 0

[commit] r9014 - freeswitch/trunk/src
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: mikej Date: Mon Jul 14 10:55:03 2008 New Revision: 9014 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_log.c Log: build tweaks for msvc Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jul 14 10:55:03 2008 @@ -937,29 +937,29 @@ #endif } else if (!strcasecmp(var, "colorize-console") && switch_true(val)) { runtime.colorize_console = SWITCH_TRUE; - } else if (!strcasecmp(var, "mailer-app")) { + } else if (!strcasecmp(var, "mailer-app") && !switch_strlen_zero(val)) { runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val); - } else if (!strcasecmp(var, "mailer-app-args")) { + } else if (!strcasecmp(var, "mailer-app-args") && !switch_strlen_zero(val)) { runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val); - } else if (!strcasecmp(var, "sessions-per-second")) { + } else if (!strcasecmp(var, "sessions-per-second") && !switch_strlen_zero(val)) { switch_core_sessions_per_second(atoi(val)); - } else if (!strcasecmp(var, "max_dtmf_duration")) { + } else if (!strcasecmp(var, "max_dtmf_duration") && !switch_strlen_zero(val)) { int tmp = atoi(val); if (tmp > 0) { switch_core_max_dtmf_duration((uint32_t) tmp); } - } else if (!strcasecmp(var, "default_dtmf_duration")) { + } else if (!strcasecmp(var, "default_dtmf_duration") && !switch_strlen_zero(val)) { int tmp = atoi(val); if (tmp > 0) { switch_core_default_dtmf_duration((uint32_t) tmp); } } else if (!strcasecmp(var, "disable-monotonic-timing")) { switch_time_set_monotonic(SWITCH_FALSE); - } else if (!strcasecmp(var, "max-sessions")) { + } else if (!strcasecmp(var, "max-sessions") && !switch_strlen_zero(val)) { switch_core_session_limit(atoi(val)); - } else if (!strcasecmp(var, "rtp-start-port")) { + } else if (!strcasecmp(var, "rtp-start-port") && !switch_strlen_zero(val)) { switch_rtp_set_start_port((switch_port_t) atoi(val)); - } else if (!strcasecmp(var, "rtp-end-port")) { + } else if (!strcasecmp(var, "rtp-end-port") && !switch_strlen_zero(val)) { switch_rtp_set_end_port((switch_port_t) atoi(val)); } } Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Jul 14 10:55:03 2008 @@ -259,6 +259,8 @@ return; } + switch_assert(level < SWITCH_LOG_INVALID); + va_start(ap, fmt); handle = switch_core_data_channel(channel); @@ -333,8 +335,8 @@ if (COLORIZE) { #ifdef WIN32 - SetConsoleTextAttribute(hStdout, COLORS[node->level]); - WriteFile(hStdout, node->data, (DWORD) strlen(node->data), NULL, NULL); + SetConsoleTextAttribute(hStdout, COLORS[level]); + WriteFile(hStdout, data, (DWORD) strlen(data), NULL, NULL); SetConsoleTextAttribute(hStdout, wOldColorAttrs); #else fprintf(handle, "%s%s%s", COLORS[level], data, SWITCH_SEQ_DEFAULT_COLOR);

1 0

[commit] r9013 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: brian Date: Mon Jul 14 09:59:53 2008 New Revision: 9013 Modified: freeswitch/trunk/conf/autoload_configs/enum.conf.xml Log: uncomment routes that aren't loaded by default. Modified: freeswitch/trunk/conf/autoload_configs/enum.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/enum.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/enum.conf.xml Mon Jul 14 09:59:53 2008 @@ -8,7 +8,7 @@ <routes> <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/${use_profile}/$1"/> - <route service="E2U+IAX2" regex="iax2:(.*)" replace="iax/$1"/> - <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/$${xmpp_server_profile}/$1"/> +  +  </routes> </configuration>

1 0

[commit] r9012 - freeswitch/trunk/src
by Freeswitch SVN 14 Jul '08

14 Jul '08

Author: anthm Date: Mon Jul 14 09:44:25 2008 New Revision: 9012 Modified: freeswitch/trunk/src/switch_log.c Log: update Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Jul 14 09:44:25 2008 @@ -331,7 +331,14 @@ #endif if (aok) { if (COLORIZE) { + +#ifdef WIN32 + SetConsoleTextAttribute(hStdout, COLORS[node->level]); + WriteFile(hStdout, node->data, (DWORD) strlen(node->data), NULL, NULL); + SetConsoleTextAttribute(hStdout, wOldColorAttrs); +#else fprintf(handle, "%s%s%s", COLORS[level], data, SWITCH_SEQ_DEFAULT_COLOR); +#endif } else { fprintf(handle, "%s", data); }

1 0