- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11240 - freeswitch/trunk/debian
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:25:05 2009 New Revision: 11240 Log: removal of mrcp from debs Modified: freeswitch/trunk/debian/dirs freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Thu Jan 15 17:25:05 2009 @@ -6,7 +6,6 @@ opt/freeswitch/conf/directory/default opt/freeswitch/conf/autoload_configs opt/freeswitch/conf/jingle_profiles -opt/freeswitch/conf/mrcp_profiles opt/freeswitch/log opt/freeswitch/db opt/freeswitch/bin/scripts Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Thu Jan 15 17:25:05 2009 @@ -58,7 +58,6 @@ /opt/freeswitch/conf/autoload_configs/local_stream.conf.xml /opt/freeswitch/conf/autoload_configs/conference.conf.xml /opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -/opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml /opt/freeswitch/conf/autoload_configs/modules.conf.xml /opt/freeswitch/conf/autoload_configs/dingaling.conf.xml /opt/freeswitch/conf/autoload_configs/iax.conf.xml @@ -72,5 +71,3 @@ /opt/freeswitch/conf/autoload_configs/fax.conf.xml /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml -/opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml -/opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Thu Jan 15 17:25:05 2009 @@ -22,7 +22,6 @@ opt/freeswitch/mod/mod_dptools.so* opt/freeswitch/mod/mod_enum.so* opt/freeswitch/mod/mod_fifo.so* -opt/freeswitch/mod/mod_openmrcp.so* opt/freeswitch/mod/mod_voipcodecs.so* opt/freeswutch/mod/mod_speex.so* opt/freeswitch/mod/mod_dialplan*.so* @@ -106,7 +105,6 @@ opt/freeswitch/conf/autoload_configs/local_stream.conf.xml opt/freeswitch/conf/autoload_configs/conference.conf.xml opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml opt/freeswitch/conf/autoload_configs/modules.conf.xml opt/freeswitch/conf/autoload_configs/dingaling.conf.xml opt/freeswitch/conf/autoload_configs/iax.conf.xml @@ -120,5 +118,3 @@ opt/freeswitch/conf/autoload_configs/fax.conf.xml opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml -opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml -opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Thu Jan 15 17:25:05 2009 @@ -14,7 +14,7 @@ applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit \ applications/mod_rss applications/mod_voicemail applications/mod_fsv \ applications/mod_fax -export ASR_TTS_MODULES=asr_tts/mod_openmrcp +export ASR_TTS_MODULES= export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml export DIRECTORIES_MODULES=

1 0

[commit] r11239 - freeswitch/trunk
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:15:59 2009 New Revision: 11239 Log: tweak spec Modified: freeswitch/trunk/freeswitch.spec Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Jan 15 17:15:59 2009 @@ -153,7 +153,7 @@ PASSTHRU_CODEC_MODULES="codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr" SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv" -ASR_TTS_MODULES="asr_tts/mod_openmrcp asr_tts/mod_pocketsphinx asr_tts/mod_flite" +ASR_TTS_MODULES="asr_tts/mod_pocketsphinx asr_tts/mod_flite" CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex" DIALPLANS_MODULES="dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml" DIRECTORIES_MODULES= @@ -323,7 +323,6 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/local_stream.conf.xml %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 @@ -376,7 +375,6 @@ %{prefix}/mod/mod_limit.so* %{prefix}/mod/mod_rss.so* %{prefix}/mod/mod_voicemail.so* -%{prefix}/mod/mod_openmrcp.so* %{prefix}/mod/mod_pocketsphinx.so* %{prefix}/mod/mod_flite.so* %{prefix}/mod/mod_ilbc.so*

1 0

[commit] r11238 - in freeswitch/trunk/conf: autoload_configs mrcp_profiles
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Thu Jan 15 17:13:45 2009 New Revision: 11238 Log: remove these files Removed: freeswitch/trunk/conf/autoload_configs/openmrcp.conf.xml freeswitch/trunk/conf/mrcp_profiles/

1 0

[commit] r11237 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: mikej Date: Thu Jan 15 17:05:50 2009 New Revision: 11237 Log: fix windows build Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Thu Jan 15 17:05:50 2009 @@ -380,10 +380,14 @@ static void sock_setup(esl_handle_t *handle) { +#ifdef WIN32 + BOOL bOptVal = TRUE; + int bOptLen = sizeof(BOOL); + setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&bOptVal, bOptLen); +#else int x = 1; - setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, &x, sizeof(x)); - +#endif } ESL_DECLARE(esl_status_t) esl_attach_handle(esl_handle_t *handle, esl_socket_t socket, struct sockaddr_in addr)

1 0

[commit] r11236 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: andrew Date: Thu Jan 15 16:58:59 2009 New Revision: 11236 Log: Commit patch from MODENDP-174 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jan 15 16:58:59 2009 @@ -1030,7 +1030,7 @@ static switch_status_t devlist(char **argv, int argc, switch_stream_handle_t *stream) { - int i, numDevices; + int i, numDevices, prev; const PaDeviceInfo *deviceInfo; numDevices = Pa_GetDeviceCount(); @@ -1039,7 +1039,32 @@ } for (i = 0; i < numDevices; i++) { deviceInfo = Pa_GetDeviceInfo(i); - stream->write_function(stream, "%d;%s;%d;%d\n", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); + stream->write_function(stream, "%d;%s;%d;%d;", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); + + prev = 0; + if (globals.ringdev == i) { + stream->write_function(stream, "r"); + prev = 1; + } + + if (globals.indev == i) { + if (prev) { + stream->write_function(stream, ","); + } + stream->write_function(stream, "i"); + prev = 1; + } + + if (globals.outdev == i) { + if (prev) { + stream->write_function(stream, ","); + } + stream->write_function(stream, "o"); + prev = 1; + } + + stream->write_function(stream, "\n"); + } return SWITCH_STATUS_SUCCESS;

1 0

[commit] r11235 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: mikej Date: Thu Jan 15 16:50:50 2009 New Revision: 11235 Log: fix windows build Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jan 15 16:50:50 2009 @@ -1769,14 +1769,13 @@ globals.ringdev = devval; } } else if ((argv[1] && !strcasecmp(argv[0], "play")) || !strcasecmp(argv[0], "ringtest")) { + switch_file_handle_t fh = { 0 }; + char *playfile = NULL; if (globals.audio_stream) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "ERROR: Cannot use this command this while a call is in progress\n"); goto done; } - switch_file_handle_t fh = { 0 }; - char *playfile = NULL; - if (!strcasecmp(argv[0], "ringtest")) { playfile = globals.ring_file; } else { @@ -1816,7 +1815,8 @@ if (engage_device(globals.sample_rate, globals.codec_ms) == SWITCH_STATUS_SUCCESS) { int samples = 0; int success = 0; - for(int i = 0; i < 400; i++) { + int i; + for(i = 0; i < 400; i++) { if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_packet, &globals.timer))) { WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.timer);

1 0

[commit] r11232 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: rupa Date: Thu Jan 15 15:51:15 2009 New Revision: 11232 Log: move svn braces Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 15:51:15 2009 @@ -131,7 +131,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown); SWITCH_MODULE_DEFINITION(mod_lcr, mod_lcr_load, mod_lcr_shutdown, NULL); -static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) { +static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) +{ size_t lstrip; size_t tstrip; char *data = NULL; @@ -158,7 +159,8 @@ return data; } -void init_max_lens(max_len maxes) { +void init_max_lens(max_len maxes) +{ maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->carrier_name = (headers[LCR_CARRIER_PLACE] == NULL ? 0 : strlen(headers[LCR_CARRIER_PLACE])); maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); @@ -166,7 +168,8 @@ maxes->rate = 8; } -switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) { +switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) +{ lcr_route current = NULL; if (routes == NULL) { @@ -211,7 +214,8 @@ } /* try each type of random until we suceed */ -static switch_bool_t set_db_random() { +static switch_bool_t set_db_random() +{ char *sql = NULL; if (globals.odbc_dsn) { sql = "SELECT * FROM lcr ORDER BY rand() LIMIT 1"; @@ -231,7 +235,8 @@ } /* make a new string with digits only */ -static char* string_digitsonly(const char *str) { +static char *string_digitsonly(const char *str) +{ char *p, *np, *newstr; size_t len; @@ -253,7 +258,8 @@ return newstr; } -static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) { +static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) +{ if (globals.odbc_dsn) { if(switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata) == SWITCH_ODBC_FAIL) { @@ -265,7 +271,8 @@ return SWITCH_FALSE; } -int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) { +int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) +{ lcr_route additional = NULL; lcr_route current = NULL; callback_t *cbt = (callback_t *) pArg; @@ -325,7 +332,8 @@ return SWITCH_STATUS_SUCCESS; } -switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) { +switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) +{ /* instantiate the object/struct we defined earlier */ switch_stream_handle_t sql_stream = { 0 }; size_t n, digit_len = strlen(digits); @@ -380,7 +388,8 @@ } } -static switch_status_t lcr_load_config() { +static switch_status_t lcr_load_config() +{ char *cf = "lcr.conf"; switch_xml_t cfg, xml, settings, param, x_profile, x_profiles; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -513,7 +522,8 @@ return status; } -static void destroy_list(lcr_route *head) { +static void destroy_list(lcr_route *head) +{ lcr_route cur = NULL, top = *head; while (top) { @@ -531,7 +541,8 @@ *head = NULL; } -SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) { +SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) +{ switch_caller_extension_t *extension = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); callback_t routes = { 0 }; @@ -569,7 +580,8 @@ return extension; } -void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) { +void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) +{ size_t i; //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "repeating %d of '%s'\n", how_many, what); @@ -629,7 +641,8 @@ } } -SWITCH_STANDARD_API(dialplan_lcr_function) { +SWITCH_STANDARD_API(dialplan_lcr_function) +{ char *argv[4] = { 0 }; int argc; char *mydata = NULL; @@ -731,7 +744,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) { +SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) +{ switch_api_interface_t *dialplan_lcr_api_interface; switch_application_interface_t *app_interface; switch_dialplan_interface_t *dp_interface; @@ -770,7 +784,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) { +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) +{ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r11232 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: rupa Date: Thu Jan 15 15:51:15 2009 New Revision: 11232 Log: move svn braces Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 15:51:15 2009 @@ -131,7 +131,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown); SWITCH_MODULE_DEFINITION(mod_lcr, mod_lcr_load, mod_lcr_shutdown, NULL); -static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) { +static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) +{ size_t lstrip; size_t tstrip; char *data = NULL; @@ -158,7 +159,8 @@ return data; } -void init_max_lens(max_len maxes) { +void init_max_lens(max_len maxes) +{ maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->carrier_name = (headers[LCR_CARRIER_PLACE] == NULL ? 0 : strlen(headers[LCR_CARRIER_PLACE])); maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); @@ -166,7 +168,8 @@ maxes->rate = 8; } -switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) { +switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) +{ lcr_route current = NULL; if (routes == NULL) { @@ -211,7 +214,8 @@ } /* try each type of random until we suceed */ -static switch_bool_t set_db_random() { +static switch_bool_t set_db_random() +{ char *sql = NULL; if (globals.odbc_dsn) { sql = "SELECT * FROM lcr ORDER BY rand() LIMIT 1"; @@ -231,7 +235,8 @@ } /* make a new string with digits only */ -static char* string_digitsonly(const char *str) { +static char *string_digitsonly(const char *str) +{ char *p, *np, *newstr; size_t len; @@ -253,7 +258,8 @@ return newstr; } -static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) { +static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) +{ if (globals.odbc_dsn) { if(switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata) == SWITCH_ODBC_FAIL) { @@ -265,7 +271,8 @@ return SWITCH_FALSE; } -int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) { +int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) +{ lcr_route additional = NULL; lcr_route current = NULL; callback_t *cbt = (callback_t *) pArg; @@ -325,7 +332,8 @@ return SWITCH_STATUS_SUCCESS; } -switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) { +switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) +{ /* instantiate the object/struct we defined earlier */ switch_stream_handle_t sql_stream = { 0 }; size_t n, digit_len = strlen(digits); @@ -380,7 +388,8 @@ } } -static switch_status_t lcr_load_config() { +static switch_status_t lcr_load_config() +{ char *cf = "lcr.conf"; switch_xml_t cfg, xml, settings, param, x_profile, x_profiles; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -513,7 +522,8 @@ return status; } -static void destroy_list(lcr_route *head) { +static void destroy_list(lcr_route *head) +{ lcr_route cur = NULL, top = *head; while (top) { @@ -531,7 +541,8 @@ *head = NULL; } -SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) { +SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) +{ switch_caller_extension_t *extension = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); callback_t routes = { 0 }; @@ -569,7 +580,8 @@ return extension; } -void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) { +void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) +{ size_t i; //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "repeating %d of '%s'\n", how_many, what); @@ -629,7 +641,8 @@ } } -SWITCH_STANDARD_API(dialplan_lcr_function) { +SWITCH_STANDARD_API(dialplan_lcr_function) +{ char *argv[4] = { 0 }; int argc; char *mydata = NULL; @@ -731,7 +744,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) { +SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) +{ switch_api_interface_t *dialplan_lcr_api_interface; switch_application_interface_t *app_interface; switch_dialplan_interface_t *dp_interface; @@ -770,7 +784,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) { +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) +{ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r11234 - in freeswitch/trunk: libs/esl libs/esl/src libs/esl/src/include src src/include src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: anthm Date: Thu Jan 15 16:11:27 2009 New Revision: 11234 Log: fix disconnect issue in event socket and fix a few small bugs Modified: freeswitch/trunk/libs/esl/src/esl.c freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/libs/esl/src/include/esl.h freeswitch/trunk/libs/esl/testserver.c freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Thu Jan 15 16:11:27 2009 @@ -37,7 +37,6 @@ #endif - /* Written by Marc Espie, public domain */ #define ESL_CTYPE_NUM_CHARS 256 @@ -181,6 +180,48 @@ #endif #endif + +int vasprintf(char **ret, const char *format, va_list ap); + +ESL_DECLARE(int) esl_vasprintf(char **ret, const char *fmt, va_list ap) +{ +#if !defined(WIN32) && !defined(__sun) + return vasprintf(ret, fmt, ap); +#else + char *buf; + int len; + size_t buflen; + va_list ap2; + char *tmp = NULL; + +#ifdef _MSC_VER +#if _MSC_VER >= 1500 + /* hack for incorrect assumption in msvc header files for code analysis */ + __analysis_assume(tmp); +#endif + ap2 = ap; +#else + va_copy(ap2, ap); +#endif + + len = vsnprintf(tmp, 0, fmt, ap2); + + if (len > 0 && (buf = malloc((buflen = (size_t) (len + 1)))) != NULL) { + len = vsnprintf(buf, buflen, fmt, ap); + *ret = buf; + } else { + *ret = NULL; + len = -1; + } + + va_end(ap2); + return len; +#endif +} + + + + ESL_DECLARE(int) esl_snprintf(char *buffer, size_t count, const char *fmt, ...) { va_list ap; @@ -236,9 +277,10 @@ static void default_logger(const char *file, const char *func, int line, int level, const char *fmt, ...) { const char *fp; - char data[1024]; + char *data; va_list ap; - + int ret; + if (level < 0 || level > 7) { level = 7; } @@ -250,10 +292,12 @@ va_start(ap, fmt); - vsnprintf(data, sizeof(data), fmt, ap); + ret = esl_vasprintf(&data, fmt, ap); - - fprintf(stderr, "[%s] %s:%d %s() %s", LEVEL_NAMES[level], file, line, func, data); + if (ret != -1) { + fprintf(stderr, "[%s] %s:%d %s() %s", LEVEL_NAMES[level], file, line, func, data); + free(data); + } va_end(ap); @@ -334,6 +378,14 @@ return s; } +static void sock_setup(esl_handle_t *handle) +{ + int x = 1; + + setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, &x, sizeof(x)); + +} + ESL_DECLARE(esl_status_t) esl_attach_handle(esl_handle_t *handle, esl_socket_t socket, struct sockaddr_in addr) { handle->sock = socket; @@ -350,9 +402,11 @@ handle->connected = 1; + sock_setup(handle); + esl_send_recv(handle, "connect\n\n"); - + if (handle->last_sr_event) { handle->info_event = handle->last_sr_event; handle->last_sr_event = NULL; @@ -413,6 +467,39 @@ return esl_send_recv(handle, send_buf); } + +ESL_DECLARE(esl_status_t) esl_filter(esl_handle_t *handle, const char *header, const char *value) +{ + char send_buf[1024] = ""; + + if (!handle->connected) { + return ESL_FAIL; + } + + snprintf(send_buf, sizeof(send_buf), "filter %s %s\n\n", header, value); + + return esl_send_recv(handle, send_buf); +} + + +ESL_DECLARE(esl_status_t) esl_events(esl_handle_t *handle, esl_event_type_t etype, const char *value) +{ + char send_buf[1024] = ""; + const char *type = "plain"; + + if (!handle->connected) { + return ESL_FAIL; + } + + if (etype == ESL_EVENT_TYPE_XML) { + type = "xml"; + } + + snprintf(send_buf, sizeof(send_buf), "event %s %s\n\n", type, value); + + return esl_send_recv(handle, send_buf); +} + static int esl_socket_reuseaddr(esl_socket_t socket) { #ifdef WIN32 @@ -536,6 +623,8 @@ goto fail; } + sock_setup(handle); + handle->connected = 1; if (esl_recv(handle)) { Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Thu Jan 15 16:11:27 2009 @@ -311,45 +311,6 @@ return ESL_SUCCESS; } -int vasprintf(char **ret, const char *format, va_list ap); - -static int esl_vasprintf(char **ret, const char *fmt, va_list ap) -{ -#if !defined(WIN32) && !defined(__sun) - return vasprintf(ret, fmt, ap); -#else - char *buf; - int len; - size_t buflen; - va_list ap2; - char *tmp = NULL; - -#ifdef _MSC_VER -#if _MSC_VER >= 1500 - /* hack for incorrect assumption in msvc header files for code analysis */ - __analysis_assume(tmp); -#endif - ap2 = ap; -#else - va_copy(ap2, ap); -#endif - - len = vsnprintf(tmp, 0, fmt, ap2); - - if (len > 0 && (buf = malloc((buflen = (size_t) (len + 1)))) != NULL) { - len = vsnprintf(buf, buflen, fmt, ap); - *ret = buf; - } else { - *ret = NULL; - len = -1; - } - - va_end(ap2); - return len; -#endif -} - - ESL_DECLARE(esl_status_t) esl_event_add_header(esl_event_t *event, esl_stack_t stack, const char *header_name, const char *fmt, ...) { int ret = 0; @@ -496,6 +457,8 @@ * the memory, allocate and only reallocate if we need more. This avoids an alloc, free CPU * destroying loop. */ + + new_len = (strlen(hp->value) * 3) + 1; if (encode_len < new_len) { @@ -575,6 +538,7 @@ snprintf(buf + len, dlen - len, "\n"); } + *str = buf; return ESL_SUCCESS; Modified: freeswitch/trunk/libs/esl/src/include/esl.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl.h Thu Jan 15 16:11:27 2009 @@ -42,6 +42,12 @@ typedef struct esl_event_header esl_event_header_t; typedef struct esl_event esl_event_t; + +typedef enum { + ESL_EVENT_TYPE_PLAIN, + ESL_EVENT_TYPE_XML +} esl_event_type_t; + #ifdef WIN32 #define ESL_SEQ_FWHITE FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY #define ESL_SEQ_FRED FOREGROUND_RED | FOREGROUND_INTENSITY @@ -164,6 +170,7 @@ #include <stdlib.h> #include <string.h> #ifndef WIN32 +#include <netinet/tcp.h> #include <sys/signal.h> #include <unistd.h> #include <ctype.h> @@ -290,6 +297,9 @@ #define ESL_LOG_EMERG ESL_PRE, ESL_LOG_LEVEL_EMERG typedef void (*esl_logger_t)(const char *file, const char *func, int line, int level, const char *fmt, ...); + +ESL_DECLARE(int) esl_vasprintf(char **ret, const char *fmt, va_list ap); + ESL_DECLARE_DATA extern esl_logger_t esl_log; ESL_DECLARE(void) esl_global_set_logger(esl_logger_t logger); @@ -320,6 +330,9 @@ ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, esl_event_t **save_event); ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms, esl_event_t **save_event); ESL_DECLARE(esl_status_t) esl_send_recv(esl_handle_t *handle, const char *cmd); +ESL_DECLARE(esl_status_t) esl_filter(esl_handle_t *handle, const char *header, const char *value); +ESL_DECLARE(esl_status_t) esl_events(esl_handle_t *handle, esl_event_type_t etype, const char *value); + #define esl_recv(_h) esl_recv_event(_h, NULL) #define esl_recv_timed(_h, _ms) esl_recv_event_timed(_h, _ms, NULL) Modified: freeswitch/trunk/libs/esl/testserver.c ============================================================================== --- freeswitch/trunk/libs/esl/testserver.c (original) +++ freeswitch/trunk/libs/esl/testserver.c Thu Jan 15 16:11:27 2009 @@ -5,23 +5,24 @@ static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struct sockaddr_in addr) { esl_handle_t handle = {{0}}; - + if (fork()) { close(client_sock); return; } - esl_attach_handle(&handle, client_sock, addr); printf("Connected! %d\n", handle.sock); - + esl_filter(&handle, "unique-id", esl_event_get_header(handle.info_event, "caller-unique-id")); + esl_events(&handle, ESL_EVENT_TYPE_PLAIN, "SESSION_HEARTBEAT CHANNEL_ANSWER CHANNEL_ORIGINATE CHANNEL_PROGRESS CHANNEL_HANGUP " + "CHANNEL_BRIDGE CHANNEL_UNBRIDGE CHANNEL_OUTGOING CHANNEL_EXECUTE CHANNEL_EXECUTE_COMPLETE DTMF CUSTOM conference::maintenance"); esl_execute(&handle, "answer", NULL, NULL); - esl_execute(&handle, "playback", "/ram/swimp.raw", NULL); + esl_execute(&handle, "conference", "3000@default", NULL); - sleep(30); + while(esl_recv(&handle) == ESL_SUCCESS); esl_disconnect(&handle); } Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Thu Jan 15 16:11:27 2009 @@ -946,6 +946,8 @@ #define SWITCH_SO_SNDBUF 64 #define SWITCH_SO_RCVBUF 128 #define SWITCH_SO_DISCONNECTED 256 +#define SWITCH_SO_TCP_NODELAY 512 + /** * @def SWITCH_INET Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Thu Jan 15 16:11:27 2009 @@ -74,7 +74,6 @@ switch_core_session_t *session; int lost_events; int lost_logs; - int hup; time_t last_flush; uint32_t timeout; uint32_t id; @@ -385,6 +384,7 @@ } switch_socket_opt_set(new_sock, SWITCH_SO_KEEPALIVE, 1); + switch_socket_opt_set(new_sock, SWITCH_SO_TCP_NODELAY, 1); if (switch_socket_connect(new_sock, sa) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n"); @@ -978,17 +978,6 @@ return SWITCH_STATUS_FALSE; } - if (switch_test_flag(listener, LFLAG_MYEVENTS) && !listener->hup && channel && !switch_channel_ready(channel)) { - listener->hup = 1; - } - - if (listener->hup == 2 || - ((!switch_test_flag(listener, LFLAG_MYEVENTS) && !switch_test_flag(listener, LFLAG_EVENTS)) && - channel && !switch_channel_ready(channel)) ) { - status = SWITCH_STATUS_FALSE; - break; - } - if (mlen) { bytes += mlen; do_sleep = 0; @@ -1124,9 +1113,9 @@ do_sleep = 0; } } - + if (switch_test_flag(listener, LFLAG_EVENTS)) { - if (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { char hbuf[512]; switch_event_t *pevent = (switch_event_t *) pop; char *etype; @@ -1148,11 +1137,8 @@ } } - if (!listener->ebuf) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No event data (allocation error?)\n"); - goto endloop; - } - + switch_assert(listener->ebuf); + len = strlen(listener->ebuf); switch_snprintf(hbuf, sizeof(hbuf), "Content-Length: %" SWITCH_SSIZE_T_FMT "\n" "Content-Type: text/event-%s\n" "\n", len, etype); @@ -1162,22 +1148,21 @@ len = strlen(listener->ebuf); switch_socket_send(listener->sock, listener->ebuf, &len); - + switch_safe_free(listener->ebuf); - endloop: + endloop: - if (listener->hup == 1 && pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { - char *uuid = switch_event_get_header(pevent, "unique-id"); - if (!strcmp(uuid, switch_core_session_get_uuid(listener->session))) { - listener->hup = 2; - } - } - switch_event_destroy(&pevent); } } } + + if (channel && !switch_channel_ready(channel)) { + status = SWITCH_STATUS_FALSE; + break; + } + if (do_sleep) { switch_cond_next(); } @@ -1775,6 +1760,9 @@ } } + switch_socket_opt_set(listener->sock, SWITCH_SO_TCP_NODELAY, TRUE); + switch_socket_opt_set(listener->sock, SWITCH_SO_NONBLOCK, TRUE); + if (prefs.acl_count && listener->sa && !switch_strlen_zero(listener->remote_ip)) { uint32_t x = 0; @@ -1932,10 +1920,18 @@ switch_mutex_unlock(listener->filter_mutex); if (listener->sock) { char disco_buf[512] = ""; - const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com/ !!!\n"; + const char message[] = "Disconnected, goodbye.\nSee you at ClueCon! http://www.cluecon.com/\n"; int mlen = strlen(message); - switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\nContent-Length: %d\n\n", mlen); + if (listener->session) { + switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\n" + "Controlled-Session-UUID: %s\n" + "Content-Length: %d\n\n", + switch_core_session_get_uuid(listener->session), mlen); + } else { + switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\nContent-Length: %d\n\n", mlen); + } + len = strlen(disco_buf); switch_socket_send(listener->sock, disco_buf, &len); len = mlen; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Jan 15 16:11:27 2009 @@ -453,7 +453,7 @@ switch_time_t b4, aftr; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Command Execute %s(%s)\n", - switch_channel_get_name(channel), app_name, app_arg); + switch_channel_get_name(channel), app_name, switch_str_nil(app_arg)); b4 = switch_timestamp_now(); switch_core_session_exec(session, application_interface, app_arg); aftr = switch_timestamp_now();

1 0

[commit] r11232 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: rupa Date: Thu Jan 15 15:51:15 2009 New Revision: 11232 Log: move svn braces Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 15:51:15 2009 @@ -131,7 +131,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown); SWITCH_MODULE_DEFINITION(mod_lcr, mod_lcr_load, mod_lcr_shutdown, NULL); -static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) { +static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) +{ size_t lstrip; size_t tstrip; char *data = NULL; @@ -158,7 +159,8 @@ return data; } -void init_max_lens(max_len maxes) { +void init_max_lens(max_len maxes) +{ maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->carrier_name = (headers[LCR_CARRIER_PLACE] == NULL ? 0 : strlen(headers[LCR_CARRIER_PLACE])); maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); @@ -166,7 +168,8 @@ maxes->rate = 8; } -switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) { +switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) +{ lcr_route current = NULL; if (routes == NULL) { @@ -211,7 +214,8 @@ } /* try each type of random until we suceed */ -static switch_bool_t set_db_random() { +static switch_bool_t set_db_random() +{ char *sql = NULL; if (globals.odbc_dsn) { sql = "SELECT * FROM lcr ORDER BY rand() LIMIT 1"; @@ -231,7 +235,8 @@ } /* make a new string with digits only */ -static char* string_digitsonly(const char *str) { +static char *string_digitsonly(const char *str) +{ char *p, *np, *newstr; size_t len; @@ -253,7 +258,8 @@ return newstr; } -static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) { +static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) +{ if (globals.odbc_dsn) { if(switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata) == SWITCH_ODBC_FAIL) { @@ -265,7 +271,8 @@ return SWITCH_FALSE; } -int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) { +int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) +{ lcr_route additional = NULL; lcr_route current = NULL; callback_t *cbt = (callback_t *) pArg; @@ -325,7 +332,8 @@ return SWITCH_STATUS_SUCCESS; } -switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) { +switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) +{ /* instantiate the object/struct we defined earlier */ switch_stream_handle_t sql_stream = { 0 }; size_t n, digit_len = strlen(digits); @@ -380,7 +388,8 @@ } } -static switch_status_t lcr_load_config() { +static switch_status_t lcr_load_config() +{ char *cf = "lcr.conf"; switch_xml_t cfg, xml, settings, param, x_profile, x_profiles; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -513,7 +522,8 @@ return status; } -static void destroy_list(lcr_route *head) { +static void destroy_list(lcr_route *head) +{ lcr_route cur = NULL, top = *head; while (top) { @@ -531,7 +541,8 @@ *head = NULL; } -SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) { +SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) +{ switch_caller_extension_t *extension = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); callback_t routes = { 0 }; @@ -569,7 +580,8 @@ return extension; } -void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) { +void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) +{ size_t i; //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "repeating %d of '%s'\n", how_many, what); @@ -629,7 +641,8 @@ } } -SWITCH_STANDARD_API(dialplan_lcr_function) { +SWITCH_STANDARD_API(dialplan_lcr_function) +{ char *argv[4] = { 0 }; int argc; char *mydata = NULL; @@ -731,7 +744,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) { +SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) +{ switch_api_interface_t *dialplan_lcr_api_interface; switch_application_interface_t *app_interface; switch_dialplan_interface_t *dp_interface; @@ -770,7 +784,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) { +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) +{ return SWITCH_STATUS_SUCCESS; }

1 0