October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10075 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Sun Oct 19 23:51:26 2008 New Revision: 10075 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: tweak Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sun Oct 19 23:51:26 2008 @@ -73,11 +73,15 @@ } } else { +#ifdef WIN32 + x64++; +#else if (sizeof(void *) == 4) { arch = "i586"; } else { x64++; } +#endif if ((mh = mpg123_new(arch, NULL))) { if (x64) {

1 0

[commit] r10074 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Sun Oct 19 20:32:21 2008 New Revision: 10074 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: don't send disconnect on every reply. 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 Sun Oct 19 20:32:21 2008 @@ -619,7 +619,7 @@ } } - if (listener->sock) { + if (listener->sock && listener->hup) { char content_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; int message_len = strlen(message);

1 0

[commit] r10073 - freeswitch/trunk/debian
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: brian Date: Sun Oct 19 20:13:42 2008 New Revision: 10073 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: remove these from debs Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Sun Oct 19 20:13:42 2008 @@ -47,7 +47,6 @@ /opt/freeswitch/conf/autoload_configs/alsa.conf.xml /opt/freeswitch/conf/autoload_configs/portaudio.conf.xml /opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -/opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml /opt/freeswitch/conf/autoload_configs/enum.conf.xml /opt/freeswitch/conf/autoload_configs/logfile.conf.xml /opt/freeswitch/conf/autoload_configs/limit.conf.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sun Oct 19 20:13:42 2008 @@ -88,7 +88,6 @@ opt/freeswitch/conf/autoload_configs/alsa.conf.xml opt/freeswitch/conf/autoload_configs/portaudio.conf.xml opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml opt/freeswitch/conf/autoload_configs/enum.conf.xml opt/freeswitch/conf/autoload_configs/logfile.conf.xml opt/freeswitch/conf/autoload_configs/limit.conf.xml

1 0

[commit] r10072 - in freeswitch/trunk/src/mod: applications/mod_conference applications/mod_voicemail asr_tts/mod_openmrcp formats/mod_shout
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: mikej Date: Sun Oct 19 19:58:43 2008 New Revision: 10072 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: (MDXMLINT-36) don't add module interfaces before returning from error conditions in module load functions Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sun Oct 19 19:58:43 2008 @@ -5290,11 +5290,6 @@ } api_syntax = p; - SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p); - SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE); - SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE); - SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send); - /* create/register custom event message type */ if (switch_event_reserve_subclass(CONF_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", CONF_EVENT_MAINT); @@ -5316,6 +5311,11 @@ return SWITCH_STATUS_GENERR; } + SWITCH_ADD_API(api_interface, "conference", "Conference module commands", conf_api_main, p); + SWITCH_ADD_APP(app_interface, global_app_name, global_app_name, NULL, conference_function, NULL, SAF_NONE); + SWITCH_ADD_APP(app_interface, "conference_set_auto_outcall", "conference_set_auto_outcall", NULL, conference_auto_function, NULL, SAF_NONE); + SWITCH_ADD_CHAT(chat_interface, CONF_CHAT_PROTO, chat_send); + send_presence(SWITCH_EVENT_PRESENCE_IN); globals.running = 1; Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sun Oct 19 19:58:43 2008 @@ -3555,7 +3555,6 @@ } /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); if (switch_event_bind(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) != SWITCH_STATUS_SUCCESS) { @@ -3563,6 +3562,7 @@ return SWITCH_STATUS_GENERR; } + SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "voicemail_inject", "voicemail_inject", voicemail_inject_api_function, VM_INJECT_USAGE); SWITCH_ADD_API(commands_api_interface, "vm_boxcount", "vm_boxcount", boxcount_api_function, BOXCOUNT_SYNTAX); 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 Sun Oct 19 19:58:43 2008 @@ -937,6 +937,11 @@ switch_speech_interface_t *speech_interface; switch_asr_interface_t *asr_interface; + /* initialize openmrcp */ + if (openmrcp_init() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); speech_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_SPEECH_INTERFACE); @@ -961,11 +966,6 @@ asr_interface->asr_check_results = openmrcp_asr_check_results; asr_interface->asr_get_results = openmrcp_asr_get_results; - /* initialize openmrcp */ - if (openmrcp_init() != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sun Oct 19 19:58:43 2008 @@ -1458,6 +1458,7 @@ curl_global_init(CURL_GLOBAL_ALL); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); file_interface->interface_name = modname; @@ -1470,16 +1471,12 @@ file_interface->file_set_string = shout_file_set_string; file_interface->file_get_string = shout_file_get_string; - /* connect my internal structure to the blank pointer passed to me */ - //*module_interface = &shout_module_interface; - shout_init(); mpg123_init(); + load_config(); SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX); - load_config(); - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10071 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: brian Date: Sun Oct 19 19:55:54 2008 New Revision: 10071 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: don't add API or complete till after the config is parsed Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sun Oct 19 19:55:54 2008 @@ -343,10 +343,6 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(xml_curl_api_interface, "xml_curl", "XML Curl", xml_curl_function, XML_CURL_SYNTAX); - switch_console_set_complete("add xml_curl debug_on"); - switch_console_set_complete("add xml_curl debug_off"); - memset(&globals,0,sizeof(globals)); globals.pool = pool; globals.hash_root = NULL; @@ -358,6 +354,10 @@ return SWITCH_STATUS_FALSE; } + SWITCH_ADD_API(xml_curl_api_interface, "xml_curl", "XML Curl", xml_curl_function, XML_CURL_SYNTAX); + switch_console_set_complete("add xml_curl debug_on"); + switch_console_set_complete("add xml_curl debug_off"); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10070 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: mikej Date: Sun Oct 19 19:31:24 2008 New Revision: 10070 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix windows build 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 Sun Oct 19 19:31:24 2008 @@ -620,14 +620,14 @@ } if (listener->sock) { - char buf[512] = ""; + char content_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; - int mlen = strlen(message); + int message_len = strlen(message); - switch_snprintf(buf, sizeof(buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", mlen); - len = strlen(buf); - switch_socket_send(listener->sock, buf, &len); - len = mlen; + switch_snprintf(content_buf, sizeof(content_buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", message_len); + len = strlen(content_buf); + switch_socket_send(listener->sock, content_buf, &len); + len = message_len; switch_socket_send(listener->sock, message, &len); }

1 0

[commit] r10069 - in freeswitch/trunk: . libs/win32/mpg123 libs/win32/mpg123/libmpg123
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: mikej Date: Sun Oct 19 19:25:29 2008 New Revision: 10069 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj freeswitch/trunk/libs/win32/mpg123/libmpg123/config.h Log: fix mod_shout build on windows Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sun Oct 19 19:25:29 2008 @@ -26,9 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XML Interfaces", "XML Interfaces", "{F69A4A6B-9360-4EBB-A280-22AA3C455AC5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" - ProjectSection(SolutionItems) = preProject - libs\win32\mpg123\libmpg123.2008.vcproj = libs\win32\mpg123\libmpg123.2008.vcproj - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" EndProject Modified: freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj Sun Oct 19 19:25:29 2008 @@ -18,9 +18,9 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)Debug" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="4" CharacterSet="1" > <Tool @@ -42,14 +42,17 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src;"$(ProjectDir)libmpg123"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC;strcasecmp=stricmp;strncasecmp=strnicmp" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" WarningLevel="4" - DebugInformationFormat="4" - DisableSpecificWarnings="4100;4018;4244;4127;4189;4389;4702" + DebugInformationFormat="3" + DisableSpecificWarnings="4100;4018;4244;4127;4189;4389;4702;4706" EnablePREfast="false" /> <Tool @@ -62,15 +65,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -80,17 +80,14 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)Release" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1" > @@ -112,12 +109,15 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="src;"$(ProjectDir)libmpg123"" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC;strcasecmp=stricmp;strncasecmp=strnicmp" RuntimeLibrary="2" UsePrecompiledHeader="0" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" WarningLevel="4" DebugInformationFormat="3" - DisableSpecificWarnings="4100;4018;4244;4127;4189;4389;4702" + DisableSpecificWarnings="4100;4018;4244;4127;4189;4389;4702;4706" EnablePREfast="false" /> <Tool @@ -130,15 +130,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -148,9 +145,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> Modified: freeswitch/trunk/libs/win32/mpg123/libmpg123/config.h ============================================================================== --- freeswitch/trunk/libs/win32/mpg123/libmpg123/config.h (original) +++ freeswitch/trunk/libs/win32/mpg123/libmpg123/config.h Sun Oct 19 19:25:29 2008 @@ -31,3 +31,5 @@ #ifndef HAVE_NO_STRERROR #define HAVE_STRERROR 1 #endif + +#include <io.h> \ No newline at end of file

1 0

[commit] r10068 - freeswitch/trunk/libs/win32/mpg123
by Freeswitch SVN 19 Oct '08

19 Oct '08

Author: mikej Date: Sun Oct 19 18:44:47 2008 New Revision: 10068 Modified: freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj Log: tweak, almost building libmpg123 on windows now Modified: freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj Sun Oct 19 18:44:47 2008 @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src;"$(ProjectDir)libmpg123"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="src;"$(ProjectDir)libmpg123"" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;OPT_GENERIC" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4"

1 0

[commit] r10067 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Oct '08

18 Oct '08

Author: mikej Date: Sat Oct 18 00:34:26 2008 New Revision: 10067 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Oct 18 00:34:26 2008 @@ -870,7 +870,7 @@ } } - if (rip && rp && switch_rtp_ready(tech_pvt->rtp_session)) { + if (*rip && *rp && switch_rtp_ready(tech_pvt->rtp_session)) { char *remote_host = switch_rtp_get_remote_host(tech_pvt->rtp_session); switch_port_t remote_port = switch_rtp_get_remote_port(tech_pvt->rtp_session), rpi = (switch_port_t) atoi(rp);

1 0

[commit] r10056 - freeswitch/trunk/src
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: anthm Date: Fri Oct 17 19:00:23 2008 New Revision: 10056 Modified: freeswitch/trunk/src/switch_core_io.c Log: fix FSCORE-206 Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Oct 17 19:00:23 2008 @@ -496,7 +496,7 @@ even_more_done: - if (!*frame) { + if (!*frame || !(*frame)->codec || !(*frame)->codec->implementation) { *frame = &runtime.dummy_cng_frame; } @@ -559,6 +559,7 @@ } switch_assert(frame->codec != NULL); + switch_assert(frame->codec->implementation != NULL); if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { need_codec = TRUE;

1 0