February 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4319 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: mikej Date: Sun Feb 18 21:21:27 2007 New Revision: 4319 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Log: add switch_core_session_sprintf which allocates from the session pool Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sun Feb 18 21:21:27 2007 @@ -393,6 +393,15 @@ */ SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, const char *todup); +/*! + \brief printf-style style printing routine. The data is output to a string allocated from the session + \param session a session to use for allocation + \param fmt The format of the string + \param ... The arguments to use while printing the data + \return The new string +*/ +SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *session, const char *fmt, ...); + /*! \brief Retrieve the memory pool from a session \param session the session to retrieve the pool from Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Feb 18 21:21:27 2007 @@ -1465,6 +1465,22 @@ return duped; } +SWITCH_DECLARE(char *) switch_core_session_sprintf(switch_core_session_t *session, const char *fmt, ...) +{ + va_list ap; + char *result = NULL; + + assert(session != NULL); + assert(session->pool != NULL); + va_start(ap, fmt); + + result = apr_pvsprintf(session->pool ,fmt, ap); + + va_end(ap); + + return result; +} + SWITCH_DECLARE(char *) switch_core_session_strdup(switch_core_session_t *session, const char *todup) {

1 0

[commit] r4318 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '07

18 Feb '07

Author: anthm Date: Sun Feb 18 11:51:11 2007 New Revision: 4318 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Feb 18 11:51:11 2007 @@ -491,7 +491,6 @@ } } - rtp_session->ready++; *new_rtp_session = rtp_session; return SWITCH_STATUS_SUCCESS; @@ -524,6 +523,8 @@ return NULL; } + rtp_session->ready = 1; + return rtp_session; }

1 0

[commit] r4317 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '07

18 Feb '07

Author: mikej Date: Sun Feb 18 09:33:55 2007 New Revision: 4317 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix typo to fix build Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Feb 18 09:33:55 2007 @@ -279,9 +279,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) { - *err = NULL; switch_socket_t *new_sock = NULL, *old_sock = NULL; switch_status_t status = SWITCH_STATUS_FALSE; + *err = NULL; if (switch_sockaddr_info_get(&rtp_session->local_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { *err = "Local Address Error!"; @@ -576,7 +576,7 @@ return; } - rtp_session->ready = 0; + (*rtp_session)->ready = 0; switch_mutex_lock((*rtp_session)->flag_mutex);

1 0

[commit] r4315 - freeswitch/trunk/src
by Freeswitch SVN 18 Feb '07

18 Feb '07

Author: anthm Date: Sat Feb 17 23:37:06 2007 New Revision: 4315 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 17 23:37:06 2007 @@ -567,7 +567,7 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) { - return (rtp_session != NULL && rtp_session->ready) ? 1 : 0; + return (rtp_session != NULL && rtp_session->sock && rtp_session->ready) ? 1 : 0; } SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session) @@ -576,6 +576,8 @@ return; } + rtp_session->ready = 0; + switch_mutex_lock((*rtp_session)->flag_mutex); if ((*rtp_session)->dtmf_data.dtmf_buffer) { @@ -760,7 +762,7 @@ rtp_session->last_time = switch_time_now(); } - while(rtp_session->ready) { + while(switch_rtp_ready(rtp_session)) { bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes);

1 0

[commit] r4314 - freeswitch/trunk/src
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: anthm Date: Sat Feb 17 17:22:52 2007 New Revision: 4314 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 17 17:22:52 2007 @@ -323,7 +323,7 @@ done: if (status != SWITCH_STATUS_SUCCESS) { - rtp_session->ready = NULL; + rtp_session->ready = 0; } if (new_sock) {

1 0

[commit] r4313 - freeswitch/trunk/src
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: anthm Date: Sat Feb 17 17:19:56 2007 New Revision: 4313 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 17 17:19:56 2007 @@ -322,6 +322,10 @@ done: + if (status != SWITCH_STATUS_SUCCESS) { + rtp_session->ready = NULL; + } + if (new_sock) { switch_socket_close(new_sock); }

1 0

[commit] r4312 - freeswitch/trunk/src
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: anthm Date: Sat Feb 17 17:13:19 2007 New Revision: 4312 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 17 17:13:19 2007 @@ -279,38 +279,58 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) { - *err = "Success"; - + *err = NULL; + switch_socket_t *new_sock = NULL, *old_sock = NULL; + switch_status_t status = SWITCH_STATUS_FALSE; + if (switch_sockaddr_info_get(&rtp_session->local_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { *err = "Local Address Error!"; - return SWITCH_STATUS_FALSE; + goto done; } if (rtp_session->sock) { switch_rtp_kill_socket(rtp_session); } - if (switch_socket_create(&rtp_session->sock, AF_INET, SOCK_DGRAM, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { + if (switch_socket_create(&new_sock, AF_INET, SOCK_DGRAM, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { *err = "Socket Error!"; - return SWITCH_STATUS_SOCKERR; + goto done; } - if (switch_socket_opt_set(rtp_session->sock, SWITCH_SO_REUSEADDR, 1) != SWITCH_STATUS_SUCCESS) { + if (switch_socket_opt_set(new_sock, SWITCH_SO_REUSEADDR, 1) != SWITCH_STATUS_SUCCESS) { *err = "Socket Error!"; - return SWITCH_STATUS_FALSE; + goto done; } - if (switch_socket_bind(rtp_session->sock, rtp_session->local_addr) != SWITCH_STATUS_SUCCESS) { + if (switch_socket_bind(new_sock, rtp_session->local_addr) != SWITCH_STATUS_SUCCESS) { *err = "Bind Error!"; - return SWITCH_STATUS_FALSE; + goto done; } + old_sock = rtp_session->sock; + rtp_session->sock = new_sock; + new_sock = NULL; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock, APR_SO_NONBLOCK, TRUE); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); } + + status = SWITCH_STATUS_SUCCESS; + *err = "Success"; switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); - return SWITCH_STATUS_SUCCESS; + + done: + + if (new_sock) { + switch_socket_close(new_sock); + } + + if (old_sock) { + switch_socket_close(old_sock); + } + + return status; } SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err)

1 0

[commit] r4311 - in freeswitch/trunk/src: . mod/languages/mod_spidermonkey
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: anthm Date: Sat Feb 17 13:40:42 2007 New Revision: 4311 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: rearrange things to work better Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Feb 17 13:40:42 2007 @@ -831,8 +831,8 @@ return JS_TRUE; } - if ((has = switch_channel_has_dtmf(channel))) { - switch_channel_dequeue_dtmf(channel, buf, has); + while ((has = switch_channel_has_dtmf(channel))) { + switch_channel_dequeue_dtmf(channel, buf, sizeof(buf)); } *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Feb 17 13:40:42 2007 @@ -2195,12 +2195,11 @@ switch_buffer_destroy(&session->raw_read_buffer); switch_buffer_destroy(&session->raw_write_buffer); - /* reset state handlers and flush dtmf */ + /* flush dtmf */ channel = switch_core_session_get_channel(session); - switch_channel_clear_state_handler(channel, NULL); - if ((has = switch_channel_has_dtmf(channel))) { - switch_channel_dequeue_dtmf(channel, buf, has); + while ((has = switch_channel_has_dtmf(channel))) { + switch_channel_dequeue_dtmf(channel, buf, sizeof(buf)); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Feb 17 13:40:42 2007 @@ -36,9 +36,8 @@ #include <switch_ivr.h> #include <libteletone.h> -static const switch_state_handler_table_t noop_state_handler = {0}; - static const switch_state_handler_table_t audio_bridge_peer_state_handlers; +static const switch_state_handler_table_t originate_state_handlers; typedef enum { IDX_CANCEL = -2, @@ -2157,6 +2156,35 @@ }; + +static switch_status_t originate_on_ring(switch_core_session_t *session) +{ + switch_channel_t *channel = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + /* put the channel in a passive state so we can loop audio to it */ + + /* clear this handler so it only works once (next time (a.k.a. Transfer) we will do the real ring state) */ + switch_channel_clear_state_handler(channel, &originate_state_handlers); + + switch_channel_set_state(channel, CS_HOLD); + + return SWITCH_STATUS_FALSE; +} + +static const switch_state_handler_table_t originate_state_handlers = { + /*.on_init */ NULL, + /*.on_ring */ originate_on_ring, + /*.on_execute */ NULL, + /*.on_hangup */ NULL, + /*.on_loopback */ NULL, + /*.on_transmit */ NULL, + /*.on_hold */ NULL +}; + + static switch_status_t uuid_bridge_on_transmit(switch_core_session_t *session) { switch_channel_t *channel = NULL; @@ -2722,12 +2750,8 @@ peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]); assert(peer_channels[i] != NULL); - //switch_channel_set_flag(peer_channels[i], CF_NO_INDICATE); - - if (table == &noop_state_handler) { - table = NULL; - } else if (!table) { - table = &audio_bridge_peer_state_handlers; + if (!table) { + table = &originate_state_handlers; } if (table) { @@ -3533,7 +3557,6 @@ switch_channel_set_private(peer_channel, "_bridge_", other_audio_thread); switch_channel_set_state(peer_channel, CS_LOOPBACK); audio_bridge_thread(NULL, (void *) this_audio_thread); - switch_core_session_reset(session); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(caller_channel, event); @@ -3560,7 +3583,7 @@ switch_yield(1000); } } - switch_core_session_reset(peer_session); + switch_core_session_rwunlock(peer_session); } else { @@ -3656,10 +3679,14 @@ assert(extension != NULL); switch_core_session_reset(session); - + + channel = switch_core_session_get_channel(session); assert(channel != NULL); + /* clear all state handlers */ + switch_channel_clear_state_handler(channel, NULL); + if ((profile = switch_channel_get_caller_profile(channel))) { new_profile = switch_caller_profile_clone(session, profile); new_profile->destination_number = switch_core_session_strdup(session, extension);

1 0

[commit] r4310 - freeswitch/trunk/src
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: anthm Date: Sat Feb 17 12:30:49 2007 New Revision: 4310 Modified: freeswitch/trunk/src/switch_ivr.c Log: move session-rest Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Feb 17 12:30:49 2007 @@ -2087,7 +2087,6 @@ switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); - switch_core_session_reset(session_a); switch_channel_clear_flag(chan_a, CF_BRIDGED); switch_mutex_lock(data->mutex); @@ -3534,6 +3533,7 @@ switch_channel_set_private(peer_channel, "_bridge_", other_audio_thread); switch_channel_set_state(peer_channel, CS_LOOPBACK); audio_bridge_thread(NULL, (void *) this_audio_thread); + switch_core_session_reset(session); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(caller_channel, event); @@ -3560,6 +3560,7 @@ switch_yield(1000); } } + switch_core_session_reset(peer_session); switch_core_session_rwunlock(peer_session); } else {

1 0

[commit] r4309 - in freeswitch/trunk: . src src/include src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 17 Feb '07

17 Feb '07

Author: mikej Date: Sat Feb 17 01:55:43 2007 New Revision: 4309 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/switch_xml.c Log: add windows build for mod_xml_cdr. This probably also fixes the build on several non-linux systems. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sat Feb 17 01:55:43 2007 @@ -544,6 +544,13 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1054,6 +1061,12 @@ {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|x64 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release|x64 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|Win32.ActiveCfg = Debug|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|Win32.Build.0 = Debug|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|x64.ActiveCfg = Debug|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|Win32.ActiveCfg = Release|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|Win32.Build.0 = Release|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1137,6 +1150,7 @@ {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Sat Feb 17 01:55:43 2007 @@ -146,6 +146,12 @@ #define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __cdecl #endif #define SIGHUP SIGTERM +#ifndef S_IRUSR +#define S_IRUSR _S_IREAD +#endif +#ifndef S_IWUSR +#define S_IWUSR _S_IWRITE +#endif #else //not win32 #define SWITCH_DECLARE(type) type #define SWITCH_DECLARE_NONSTD(type) type Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Sat Feb 17 01:55:43 2007 @@ -29,9 +29,9 @@ * mod_xml_cdr.c -- XML CDR Module * */ +#include <sys/stat.h> #include <switch.h> - static const char modname[] = "mod_xml_cdr"; static switch_status_t my_on_hangup(switch_core_session_t *session) @@ -55,13 +55,17 @@ if ((path = switch_mprintf("%s/xml_cdr/%s.cdr.xml", logdir, uuid_str))) { if ((xml_text = switch_xml_toxml(cdr))) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - write(fd, header, strlen(header)); - write(fd, xml_text, strlen(xml_text)); + write(fd, header, (unsigned)strlen(header)); + write(fd, xml_text, (unsigned)strlen(xml_text)); close(fd); fd = -1; } else { char ebuf[512] = {0}; +#ifdef WIN32 + strerror_s(ebuf, sizeof(ebuf), errno); +#else strerror_r(errno, ebuf, sizeof(ebuf)); +#endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); } free(xml_text); Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Sat Feb 17 01:55:43 2007 @@ -59,14 +59,6 @@ #ifdef HAVE_MMAP #include <sys/mman.h> #endif -#ifdef WIN32 -#ifndef S_IRUSR -#define S_IRUSR _S_IREAD -#endif -#ifndef S_IWUSR -#define S_IWUSR _S_IWRITE -#endif -#endif #define SWITCH_XML_WS "\t\r\n " // whitespace #define SWITCH_XML_ERRL 128 // maximum error string length

1 0