- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4323 - freeswitch/trunk/src
by Freeswitch SVN 19 Feb '07

19 Feb '07

Author: anthm Date: Mon Feb 19 10:20:16 2007 New Revision: 4323 Modified: freeswitch/trunk/src/switch_ivr.c Log: add rwlocks to bridge Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 19 10:20:16 2007 @@ -1965,7 +1965,8 @@ pre_b = switch_channel_test_flag(chan_a, CF_EARLY_MEDIA); ans_b = switch_channel_test_flag(chan_b, CF_ANSWERED); } - + switch_core_session_read_lock(session_a); + switch_core_session_read_lock(session_b); switch_channel_set_flag(chan_a, CF_BRIDGED); @@ -2091,6 +2092,9 @@ switch_mutex_lock(data->mutex); data->running = 0; switch_mutex_unlock(data->mutex); + + switch_core_session_rwunlock(session_a); + switch_core_session_rwunlock(session_b); return NULL; }

1 0

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

19 Feb '07

Author: mikej Date: Sun Feb 18 22:23:02 2007 New Revision: 4321 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/switch_caller.c Log: constify switch_caller_profile_new Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Sun Feb 18 22:23:02 2007 @@ -171,17 +171,17 @@ \return a new profile object allocated from the session's memory pool */ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memory_pool_t *pool, - char *username, - char *dialplan, - char *caller_id_name, - char *caller_id_number, - char *network_addr, - char *ani, - char *aniii, - char *rdnis, - char *source, - char *context, - char *destination_number); + const char *username, + const char *dialplan, + const char *caller_id_name, + const char *caller_id_number, + const char *network_addr, + const char *ani, + const char *aniii, + const char *rdnis, + const char *source, + const char *context, + const char *destination_number); /*! \brief Clone an existing caller profile object Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Sun Feb 18 22:23:02 2007 @@ -33,17 +33,17 @@ #include <switch_caller.h> SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memory_pool_t *pool, - char *username, - char *dialplan, - char *caller_id_name, - char *caller_id_number, - char *network_addr, - char *ani, - char *aniii, - char *rdnis, - char *source, - char *context, - char *destination_number) + const char *username, + const char *dialplan, + const char *caller_id_name, + const char *caller_id_number, + const char *network_addr, + const char *ani, + const char *aniii, + const char *rdnis, + const char *source, + const char *context, + const char *destination_number) {

1 0

[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