- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

17 Oct '08

Author: anthm Date: Fri Oct 17 15:25:00 2008 New Revision: 10055 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix ip change detction code for proxy mode 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 Fri Oct 17 15:25:00 2008 @@ -870,12 +870,18 @@ } } - if (tech_pvt->remote_sdp_audio_ip && !strcmp(tech_pvt->remote_sdp_audio_ip, rip) && atoi(rp) == tech_pvt->remote_sdp_audio_port) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", - tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); - return SWITCH_STATUS_SUCCESS; - } + 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); + if (remote_host && remote_port && !strcmp(remote_host, rip) && remote_port == rpi) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n", + tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); + return SWITCH_STATUS_SUCCESS; + } + + } + if (switch_rtp_ready(tech_pvt->rtp_session)) { if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {

1 0

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

17 Oct '08

Author: anthm Date: Fri Oct 17 14:55:17 2008 New Revision: 10054 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: make event socket wait for hangup on outbound mode and send disconnect message 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 Fri Oct 17 14:55:17 2008 @@ -47,7 +47,7 @@ LFLAG_FULL = (1 << 4), LFLAG_MYEVENTS = (1 << 5), LFLAG_SESSION = (1 << 6), - LFLAG_ASYNC = (1 << 7), + LFLAG_ASYNC = (1 << 7) } event_flag_t; typedef enum {

1 0

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

17 Oct '08

Author: anthm Date: Fri Oct 17 14:44:26 2008 New Revision: 10053 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: make event socket wait for hangup on outbound mode and send disconnect message 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 Fri Oct 17 14:44:26 2008 @@ -47,7 +47,7 @@ LFLAG_FULL = (1 << 4), LFLAG_MYEVENTS = (1 << 5), LFLAG_SESSION = (1 << 6), - LFLAG_ASYNC = (1 << 7) + LFLAG_ASYNC = (1 << 7), } event_flag_t; typedef enum { @@ -71,6 +71,7 @@ switch_core_session_t *session; int lost_events; int lost_logs; + int hup; switch_sockaddr_t *sa; char remote_ip[50]; switch_port_t remote_port; @@ -171,7 +172,7 @@ send = 1; } } - + if (send && switch_test_flag(l, LFLAG_MYEVENTS)) { char *uuid = switch_event_get_header(event, "unique-id"); if (!uuid || strcmp(uuid, switch_core_session_get_uuid(l->session))) { @@ -428,9 +429,15 @@ return SWITCH_STATUS_FALSE; } - if (channel && !switch_channel_ready(channel)) { + 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; + break; } if (mlen) { @@ -595,6 +602,14 @@ switch_safe_free(listener->ebuf); 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); } } @@ -604,7 +619,17 @@ } } - + if (listener->sock) { + char buf[512] = ""; + const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; + int mlen = 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_socket_send(listener->sock, message, &len); + } return status; @@ -1137,7 +1162,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", listener->remote_ip, prefs.acl[x]); - switch_snprintf(buf, sizeof(buf), "Content-Type: rude/rejection\nContent-Length %d\n\n", mlen); + switch_snprintf(buf, sizeof(buf), "Content-Type: text/rude-rejection\nContent-Length %d\n\n", mlen); len = strlen(buf); switch_socket_send(listener->sock, buf, &len); len = mlen;

1 0

[commit] r10052 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 17 Oct '08

17 Oct '08

Author: brian Date: Fri Oct 17 04:38:30 2008 New Revision: 10052 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: tweak so this doesn't have to eval every call Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Oct 17 04:38:30 2008 @@ -83,7 +83,7 @@ <condition field="${numbering_plan}" expression="^$" break="never"> <action application="set_user" data="default@${domain_name}"/> </condition> - <condition field="${call_debug}" expression="^true$" break="never"> + <condition field="$${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Fri Oct 17 04:38:30 2008 @@ -31,7 +31,7 @@ </extension> <extension name="call_debug" continue="true"> - <condition field="${call_debug}" expression="^true$" break="never"> + <condition field="$${call_debug}" expression="^true$" break="never"> <action application="info"/> </condition> </extension>

1 0