- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8707 - freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 12:38:32 2008 New Revision: 8707 Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h Log: fix xmlrpc-c build on OS X 10.4 (FSBUILD-47) Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h (original) +++ freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/util_int.h Wed May 28 12:38:32 2008 @@ -3,8 +3,12 @@ #include "util.h" +#ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX #define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif /* When we deallocate a pointer in a struct, we often replace it with ** this and throw in a few assertions here and there. */

1 0

[commit] r8706 - in freeswitch/trunk/src: . mod/formats/mod_local_stream
by Freeswitch SVN 28 May '08

28 May '08

Author: anthm Date: Wed May 28 11:14:18 2008 New Revision: 8706 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_play_say.c Log: make local_stream more solid Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed May 28 11:14:18 2008 @@ -75,6 +75,8 @@ switch_mutex_t *mutex; switch_memory_pool_t *pool; int shuffle; + switch_thread_rwlock_t *rwlock; + int ready; }; typedef struct local_stream_source local_stream_source_t; @@ -115,11 +117,18 @@ skip = do_rand(); } - switch_core_hash_insert(globals.source_hash, source->name, source); + switch_thread_rwlock_create(&source->rwlock, source->pool); + + if (RUNNING) { + switch_mutex_lock(globals.mutex); + switch_core_hash_insert(globals.source_hash, source->name, source); + switch_mutex_unlock(globals.mutex); + source->ready = 1; + } while (RUNNING) { const char *fname; - + if (switch_dir_open(&source->dir_handle, source->location, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't open directory: %s\n", source->location); goto done; @@ -231,8 +240,14 @@ } done: + source->ready = 0; + switch_mutex_lock(globals.mutex); switch_core_hash_delete(globals.source_hash, source->name); + switch_mutex_unlock(globals.mutex); + switch_thread_rwlock_wrlock(source->rwlock); + switch_thread_rwlock_unlock(source->rwlock); + switch_buffer_destroy(&audio_buffer); if (fd > -1) { @@ -264,6 +279,11 @@ } else { source = switch_core_hash_find(globals.source_hash, path); } + if (source) { + if (switch_thread_rwlock_tryrdlock(source->rwlock) != SWITCH_STATUS_SUCCESS) { + source = NULL; + } + } switch_mutex_unlock(globals.mutex); if (!source) { @@ -330,7 +350,8 @@ context->source->total--; switch_mutex_unlock(context->source->mutex); switch_buffer_destroy(&context->audio_buffer); - + switch_thread_rwlock_unlock(context->source->rwlock); + return SWITCH_STATUS_SUCCESS; } @@ -340,6 +361,11 @@ switch_size_t bytes = 0; size_t need = *len * 2; + if (!context->source->ready) { + *len = 0; + return SWITCH_STATUS_FALSE; + } + switch_mutex_lock(context->audio_mutex); if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { *len = bytes / 2; Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed May 28 11:14:18 2008 @@ -133,6 +133,7 @@ } if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS) { + *len = 0; goto done; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed May 28 11:14:18 2008 @@ -1021,7 +1021,9 @@ if (!asis) { olen /= 2; } - switch_core_file_read(fh, abuf, &olen); + if (switch_core_file_read(fh, abuf, &olen) != SWITCH_STATUS_SUCCESS) { + break; + } switch_buffer_write(fh->audio_buffer, abuf, asis ? olen : olen * 2); olen = switch_buffer_read(fh->audio_buffer, abuf, framelen); if (!asis) {

1 0

[commit] r8705 - freeswitch/trunk
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 10:11:26 2008 New Revision: 8705 Modified: freeswitch/trunk/freeswitch.spec Log: FSBUILD-46, missing ./ Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Wed May 28 10:11:26 2008 @@ -180,7 +180,7 @@ if test ! -f Makefile.in then - bootstrap.sh + ./bootstrap.sh fi

1 0

[commit] r8704 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 28 May '08

28 May '08

Author: mikej Date: Wed May 28 00:50:51 2008 New Revision: 8704 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: don't try to open failed local_stream's (MODFORM-9) Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed May 28 00:50:51 2008 @@ -115,6 +115,8 @@ skip = do_rand(); } + switch_core_hash_insert(globals.source_hash, source->name, source); + while (RUNNING) { const char *fname; @@ -229,6 +231,8 @@ } done: + switch_core_hash_delete(globals.source_hash, source->name); + switch_buffer_destroy(&audio_buffer); if (fd > -1) { @@ -431,8 +435,6 @@ source->samples = switch_samples_per_frame(source->rate, source->interval); - switch_core_hash_insert(globals.source_hash, source->name, source); - switch_mutex_init(&source->mutex, SWITCH_MUTEX_NESTED, source->pool); switch_threadattr_create(&thd_attr, source->pool);

1 0

[commit] r8703 - freeswitch/trunk
by Freeswitch SVN 28 May '08

28 May '08

Author: anthm Date: Tue May 27 23:51:32 2008 New Revision: 8703 Modified: freeswitch/trunk/Makefile.am Log: add DESTDIR Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue May 27 23:51:32 2008 @@ -21,7 +21,7 @@ soundfile=`echo freeswitch-sounds-$$full_sound_dir-$(SOUNDS_VERSION).tar.gz`; \ if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \ if test "$$target_prefix" = "sounds"; then \ - if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \ + if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)$(PREFIX)/sounds/; else $(GETSOUNDS) $$soundfile ; fi; \ else \ cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\ fi

1 0

[commit] r8701 - freeswitch/trunk/src
by Freeswitch SVN 27 May '08

27 May '08

Author: anthm Date: Tue May 27 16:19:19 2008 New Revision: 8701 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: pit crew, fix race in intercept Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue May 27 16:19:19 2008 @@ -951,7 +951,7 @@ SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid, switch_bool_t bleg) { switch_core_session_t *rsession, *bsession = NULL; - switch_channel_t *channel, *rchannel, *bchannel; + switch_channel_t *channel, *rchannel, *bchannel = NULL; const char *buuid; char brto[SWITCH_UUID_FORMATTED_LENGTH + 1] = ""; @@ -976,24 +976,31 @@ if ((buuid = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE))) { bsession = switch_core_session_locate(buuid); + bchannel = switch_core_session_get_channel(bsession); } if (!switch_channel_test_flag(rchannel, CF_ANSWERED)) { switch_channel_answer(rchannel); } - //switch_ivr_park_session(rsession); + switch_channel_set_state_flag(rchannel, CF_TRANSFER); - switch_channel_set_state(rchannel, CS_RESET); + switch_channel_set_state(rchannel, CS_PARK); + + if (bchannel) { + switch_channel_set_state_flag(bchannel, CF_TRANSFER); + switch_channel_set_state(bchannel, CS_PARK); + } + + switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), uuid); + switch_core_session_rwunlock(rsession); if (bsession) { - bchannel = switch_core_session_get_channel(bsession); switch_channel_hangup(bchannel, SWITCH_CAUSE_PICKED_OFF); switch_core_session_rwunlock(bsession); } - switch_core_session_rwunlock(rsession); + - switch_ivr_uuid_bridge(switch_core_session_get_uuid(session), uuid); } /* For Emacs:

1 0

[commit] r8700 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Tue May 27 16:04:04 2008 New Revision: 8700 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) 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 Tue May 27 16:04:04 2008 @@ -532,6 +532,11 @@ } } + if (!listener->ebuf) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No event data (allocation error?)\n"); + goto endloop; + } + 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); @@ -577,6 +582,11 @@ char *reply, *freply = NULL; switch_status_t status; + if (!acs) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Internal error.\n"); + return NULL; + } + if (!acs->listener || !acs->listener->rwlock || switch_thread_rwlock_tryrdlock(acs->listener->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! cannot get read lock.\n"); goto done; @@ -631,7 +641,7 @@ } done: - if (acs && acs->bg) { + if (acs->bg) { switch_memory_pool_t *pool = acs->pool; acs = NULL; switch_core_destroy_memory_pool(&pool);

1 0

[commit] r8699 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Tue May 27 15:45:55 2008 New Revision: 8699 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Tue May 27 15:45:55 2008 @@ -212,13 +212,16 @@ } if (g_template_str != a_template_str) { - if (log_line && log_line != a_template_str) { + if (log_line != a_template_str) { switch_safe_free(log_line); } log_line = switch_channel_expand_variables(channel, g_template_str); } - + if (!log_line) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating cdr\n"); + return SWITCH_STATUS_FALSE; + } path = switch_mprintf("%s%sMaster.csv", log_dir, SWITCH_PATH_SEPARATOR); assert(path); @@ -226,7 +229,7 @@ free(path); - if (log_line && log_line != g_template_str) { + if (log_line != g_template_str) { free(log_line); }

1 0

[commit] r8698 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 27 May '08

27 May '08

Author: anthm Date: Tue May 27 14:51:09 2008 New Revision: 8698 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: prevent intercept race condition that can also be solved with continue_on_fail=originator_cancel Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue May 27 14:51:09 2008 @@ -1797,7 +1797,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Originate Failed. Cause: %s\n", switch_channel_cause2str(cause)); /* no answer is *always* a reason to continue */ - if (cause == SWITCH_CAUSE_NO_ANSWER || cause == SWITCH_CAUSE_NO_USER_RESPONSE) { + if (cause == SWITCH_CAUSE_NO_ANSWER || cause == SWITCH_CAUSE_NO_USER_RESPONSE || cause == SWITCH_CAUSE_ORIGINATOR_CANCEL) { return; }

1 0

[commit] r8694 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 May '08

27 May '08

Author: anthm Date: Tue May 27 11:45:22 2008 New Revision: 8694 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: save transport string in record route for sticky nat stuff Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue May 27 11:45:22 2008 @@ -2721,8 +2721,11 @@ if (sip->sip_contact && sip->sip_contact->m_url) { char tmp[35] = ""; - tech_pvt->record_route = switch_core_session_sprintf(session, "sip:%s@%s:%d", - sip->sip_contact->m_url->url_user, tech_pvt->remote_ip, tech_pvt->remote_port); + sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); + + tech_pvt->record_route = switch_core_session_sprintf(session, "sip:%s@%s:%d;transport=%s", + sip->sip_contact->m_url->url_user, tech_pvt->remote_ip, + tech_pvt->remote_port, sofia_glue_transport2str(transport)); switch_channel_set_variable(channel, "sip_received_ip", tech_pvt->remote_ip); snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_port); switch_channel_set_variable(channel, "sip_received_port", tmp);

1 0