- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10047 - freeswitch/trunk/src/mod/applications/mod_skel
by Freeswitch SVN 16 Oct '08

16 Oct '08

Author: anthm Date: Thu Oct 16 16:06:13 2008 New Revision: 10047 Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Log: typo Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Oct 16 16:06:13 2008 @@ -51,7 +51,7 @@ /* Called when the system shuts down -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown) { return SWITCH_STATUS_SUCCESS; } @@ -60,7 +60,7 @@ /* If it exists, this is called in it's own thread when the module-load completes If it returns anything but SWITCH_STATUS_TERM it will be called again automatically -SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime); +SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime) { while(looping) {

1 0

[commit] r10046 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '08

16 Oct '08

Author: anthm Date: Thu Oct 16 12:48:55 2008 New Revision: 10046 Modified: freeswitch/trunk/src/switch_core_codec.c Log: doh Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Oct 16 12:48:55 2008 @@ -44,7 +44,6 @@ SWITCH_DECLARE(void) switch_core_session_unset_read_codec(switch_core_session_t *session) { - switch_mutex_lock(session->resample_mutex); session->real_read_codec = session->read_codec = NULL; }

1 0

[commit] r10045 - in freeswitch/trunk/src: . include include/private
by Freeswitch SVN 16 Oct '08

16 Oct '08

Author: anthm Date: Thu Oct 16 12:34:52 2008 New Revision: 10045 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_codec.c Log: avoiding deadlock Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu Oct 16 12:34:52 2008 @@ -111,6 +111,11 @@ switch_codec_t *video_read_codec; switch_codec_t *video_write_codec; + switch_codec_implementation_t read_impl; + switch_codec_implementation_t write_impl; + switch_codec_implementation_t video_read_impl; + switch_codec_implementation_t video_write_impl; + switch_audio_resampler_t *read_resampler; switch_audio_resampler_t *write_resampler; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Oct 16 12:34:52 2008 @@ -1134,6 +1134,13 @@ SWITCH_DECLARE(void) switch_core_session_unset_read_codec(_In_ switch_core_session_t *session); SWITCH_DECLARE(void) switch_core_session_unset_write_codec(_In_ switch_core_session_t *session); + +SWITCH_DECLARE(switch_status_t) switch_core_session_get_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp); +SWITCH_DECLARE(switch_status_t) switch_core_session_get_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp); +SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp); +SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp); + + /*! \brief Retrieve the read codec from a given session \param session session to retrieve from Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Oct 16 12:34:52 2008 @@ -46,14 +46,11 @@ { switch_mutex_lock(session->resample_mutex); session->real_read_codec = session->read_codec = NULL; - switch_mutex_unlock(session->resample_mutex); } SWITCH_DECLARE(void) switch_core_session_unset_write_codec(switch_core_session_t *session) -{ - switch_mutex_lock(session->resample_mutex); +{ session->real_write_codec = session->write_codec = NULL; - switch_mutex_unlock(session->resample_mutex); } @@ -64,8 +61,6 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_mutex_lock(session->resample_mutex); - if (codec && !codec->implementation) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n"); status = SWITCH_STATUS_FALSE; @@ -77,6 +72,7 @@ if (session->real_read_codec) { if (session->real_read_codec->implementation) { session->read_codec = session->real_read_codec; + session->read_impl = *session->real_read_codec->implementation; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "resetting to uninitilized codec, setting to NULL\n"); session->read_codec = session->real_read_codec = NULL; @@ -96,25 +92,26 @@ } session->read_codec = codec; + session->read_impl = *codec->implementation; if (!session->real_read_codec) { session->real_read_codec = session->read_codec; } } - if (session->read_codec && session->read_codec->implementation) { + if (session->read_codec && codec && session->read_impl.bytes_per_frame) { if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", session->read_codec->implementation->iananame); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_codec->implementation->actual_samples_per_second); - if (session->read_codec->implementation->actual_samples_per_second != session->read_codec->implementation->samples_per_second) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_codec->implementation->samples_per_second); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", session->read_impl.iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_impl.actual_samples_per_second); + if (session->read_impl.actual_samples_per_second != session->read_impl.samples_per_second) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_impl.samples_per_second); } switch_event_fire(&event); } - switch_channel_set_variable(channel, "read_codec", session->read_codec->implementation->iananame); - switch_snprintf(tmp, sizeof(tmp), "%d", session->read_codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "read_codec", session->read_impl.iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", session->read_impl.actual_samples_per_second); switch_channel_set_variable(channel, "read_rate", tmp); @@ -125,7 +122,6 @@ } end: - switch_mutex_unlock(session->resample_mutex); return status; @@ -133,22 +129,57 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_read_codec(switch_core_session_t *session) { - switch_codec_t *codec; - switch_mutex_lock(session->resample_mutex); - codec = session->read_codec; - switch_mutex_unlock(session->resample_mutex); + switch_codec_t *codec; codec = session->read_codec; return codec; } SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(switch_core_session_t *session) { - switch_codec_t *codec; - switch_mutex_lock(session->resample_mutex); - codec = session->real_read_codec ? session->real_read_codec : session->read_codec; - switch_mutex_unlock(session->resample_mutex); + switch_codec_t *codec; codec = session->real_read_codec ? session->real_read_codec : session->read_codec; return codec; } +SWITCH_DECLARE(switch_status_t) switch_core_session_get_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp) +{ + if (session->read_impl.bytes_per_frame) { + *impp = session->read_impl; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(switch_status_t) switch_core_session_get_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp) +{ + if (session->write_impl.bytes_per_frame) { + *impp = session->write_impl; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp) +{ + if (session->video_read_impl.bytes_per_frame) { + *impp = session->video_read_impl; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp) +{ + if (session->video_write_impl.bytes_per_frame) { + *impp = session->video_write_impl; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + + SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_session_t *session, switch_codec_t *codec) { switch_event_t *event; @@ -156,11 +187,10 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_mutex_lock(session->resample_mutex); - if (!codec || !codec->implementation) { if (session->real_write_codec) { session->write_codec = session->real_write_codec; + session->write_impl = *session->real_write_codec->implementation; session->real_write_codec = NULL; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); @@ -171,6 +201,7 @@ if (session->real_write_codec) { if (codec == session->real_write_codec) { session->write_codec = codec; + session->write_impl = *codec->implementation; session->real_write_codec = NULL; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); @@ -180,29 +211,32 @@ } else { session->real_write_codec = session->write_codec; session->write_codec = codec; + session->write_impl = *codec->implementation; } } else { session->write_codec = codec; + session->write_impl = *codec->implementation; } - if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(session->channel, event); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", session->write_codec->implementation->iananame); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", session->write_codec->implementation->actual_samples_per_second); - if (session->write_codec->implementation->actual_samples_per_second != session->write_codec->implementation->samples_per_second) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-write-codec-rate", "%d", - session->write_codec->implementation->actual_samples_per_second); + if (session->write_codec && codec && session->write_impl.bytes_per_frame) { + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", session->write_impl.iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", session->write_impl.actual_samples_per_second); + if (session->write_impl.actual_samples_per_second != session->write_impl.samples_per_second) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-write-codec-rate", "%d", + session->write_impl.actual_samples_per_second); + } + switch_event_fire(&event); } - switch_event_fire(&event); - } - switch_channel_set_variable(channel, "write_codec", session->write_codec->implementation->iananame); - switch_snprintf(tmp, sizeof(tmp), "%d", session->write_codec->implementation->actual_samples_per_second); - switch_channel_set_variable(channel, "write_rate", tmp); + switch_channel_set_variable(channel, "write_codec", session->write_impl.iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", session->write_impl.actual_samples_per_second); + switch_channel_set_variable(channel, "write_rate", tmp); + } end: - switch_mutex_unlock(session->resample_mutex); return status; } @@ -210,10 +244,7 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_write_codec(switch_core_session_t *session) { switch_codec_t *codec; - - switch_mutex_lock(session->resample_mutex); codec = session->write_codec; - switch_mutex_unlock(session->resample_mutex); return codec; } @@ -221,10 +252,7 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core_session_t *session) { switch_codec_t *codec; - - switch_mutex_lock(session->resample_mutex); codec = session->real_write_codec ? session->real_write_codec : session->write_codec; - switch_mutex_unlock(session->resample_mutex); return codec; } @@ -238,8 +266,6 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_mutex_lock(session->resample_mutex); - if (!codec || !codec->implementation) { if (session->video_read_codec) { session->video_read_codec = NULL; @@ -263,20 +289,16 @@ switch_channel_set_variable(channel, "video_read_rate", tmp); session->video_read_codec = codec; - + session->video_read_impl = *codec->implementation; end: - switch_mutex_unlock(session->resample_mutex); return status; } SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_read_codec(switch_core_session_t *session) { switch_codec_t *codec; - - switch_mutex_lock(session->resample_mutex); codec = session->video_read_codec; - switch_mutex_unlock(session->resample_mutex); return codec; @@ -288,9 +310,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - - switch_mutex_lock(session->resample_mutex); - if (!codec || !codec->implementation) { + if (!codec || !codec->implementation) { if (session->video_write_codec) { session->video_write_codec = NULL; status = SWITCH_STATUS_SUCCESS; @@ -313,20 +333,17 @@ switch_channel_set_variable(channel, "video_write_rate", tmp); session->video_write_codec = codec; + session->video_write_impl = *codec->implementation; end: - switch_mutex_unlock(session->resample_mutex); return status; } SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_write_codec(switch_core_session_t *session) { switch_codec_t *codec; - - switch_mutex_lock(session->resample_mutex); codec = session->video_write_codec; - switch_mutex_unlock(session->resample_mutex); return codec;

1 0

[commit] r10044 - freeswitch/trunk/libs/apr/locks/win32
by Freeswitch SVN 16 Oct '08

16 Oct '08

Author: anthm Date: Thu Oct 16 11:47:45 2008 New Revision: 10044 Modified: freeswitch/trunk/libs/apr/locks/win32/thread_cond.c Log: add patch to fix leak Modified: freeswitch/trunk/libs/apr/locks/win32/thread_cond.c ============================================================================== --- freeswitch/trunk/libs/apr/locks/win32/thread_cond.c (original) +++ freeswitch/trunk/libs/apr/locks/win32/thread_cond.c Thu Oct 16 11:47:45 2008 @@ -37,6 +37,10 @@ (*cond)->event = CreateEvent(NULL, TRUE, FALSE, NULL); (*cond)->signal_all = 0; (*cond)->num_waiting = 0; + + apr_pool_cleanup_register(pool, *cond, thread_cond_cleanup, + apr_pool_cleanup_null); + return APR_SUCCESS; }

1 0

[commit] r10043 - in freeswitch/trunk/src: . include
by Freeswitch SVN 16 Oct '08

16 Oct '08

Author: anthm Date: Thu Oct 16 11:24:02 2008 New Revision: 10043 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/switch_apr.c Log: expose more of apr socket code Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Thu Oct 16 11:24:02 2008 @@ -1171,13 +1171,36 @@ /** @} */ +typedef enum { + SWITCH_NO_DESC, /**< nothing here */ + SWITCH_POLL_SOCKET, /**< descriptor refers to a socket */ + SWITCH_POLL_FILE, /**< descriptor refers to a file */ + SWITCH_POLL_LASTDESC /**< descriptor is the last one in the list */ +} switch_pollset_type_t; + +typedef union { + switch_file_t *f; /**< file */ + switch_socket_t *s; /**< socket */ +} switch_descriptor_t; + +struct switch_pollfd { + switch_memory_pool_t *p; /**< associated pool */ + switch_pollset_type_t desc_type; /**< descriptor type */ + int16_t reqevents; /**< requested events */ + int16_t rtnevents; /**< returned events */ + switch_descriptor_t desc; /**< @see apr_descriptor */ + void *client_data; /**< allows app to associate context */ +}; + + + /** * @defgroup apr_poll Poll Routines * @ingroup switch_apr * @{ */ /** Poll descriptor set. */ - typedef struct apr_pollfd_t switch_pollfd_t; + typedef struct switch_pollfd switch_pollfd_t; /** Opaque structure used for pollset API */ typedef struct apr_pollset_t switch_pollset_t; Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Thu Oct 16 11:24:02 2008 @@ -751,12 +751,12 @@ SWITCH_DECLARE(switch_status_t) switch_pollset_add(switch_pollset_t *pollset, const switch_pollfd_t *descriptor) { - return apr_pollset_add(pollset, descriptor); + return apr_pollset_add((apr_pollset_t *)pollset, (apr_pollfd_t *)descriptor); } SWITCH_DECLARE(switch_status_t) switch_poll(switch_pollfd_t *aprset, int32_t numsock, int32_t *nsds, switch_interval_time_t timeout) { - return apr_poll(aprset, numsock, nsds, timeout); + return apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); } SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t **poll, switch_socket_t *sock, int16_t flags, switch_memory_pool_t *pool)

1 0

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

16 Oct '08

Author: brian Date: Wed Oct 15 21:51:46 2008 New Revision: 10042 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Oct 15 21:51:46 2008 @@ -995,11 +995,11 @@ case SWITCH_MESSAGE_INDICATE_REDIRECT: if (!switch_strlen_zero(msg->string_arg)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg); nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); switch_set_flag_locked(tech_pvt, TFLAG_BYE); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for Re-directing to %s, already answered\n", msg->string_arg); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for redirecting to %s, already answered\n", msg->string_arg); } } break;

1 0

[commit] r10041 - freeswitch/trunk/scripts/socket/FreeSWITCH
by Freeswitch SVN 16 Oct '08

16 Oct '08

Author: brian Date: Wed Oct 15 20:23:46 2008 New Revision: 10041 Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Log: tweak FreeSWITCH::Client to not delete keys that are already lowercase ie. variables in the events Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm ============================================================================== --- freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm (original) +++ freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Wed Oct 15 20:23:46 2008 @@ -195,8 +195,11 @@ foreach (keys %h) { my $new = lc $_; - $h{$new} = $h{$_}; - delete $h{$_}; + if (!($new eq $_)) { + # do not delete keys that were already lowercase + $h{$new} = $h{$_}; + delete $h{$_}; + } } foreach(keys %h) { htdecode(\$h{$_});

1 0

[commit] r10040 - freeswitch/trunk/src
by Freeswitch SVN 15 Oct '08

15 Oct '08

Author: mikej Date: Wed Oct 15 19:13:36 2008 New Revision: 10040 Modified: freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: make valgrind not complain about these threads Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Oct 15 19:13:36 2008 @@ -490,6 +490,7 @@ switch_threadattr_create(&thd_attr, pool); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_threadattr_priority_increase(thd_attr); + switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, switch_event_dispatch_thread, EVENT_DISPATCH_QUEUE[index], pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Create event dispatch thread %d\n", index); } @@ -527,6 +528,7 @@ switch_core_hash_init(&CUSTOM_HASH, RUNTIME_POOL); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_threadattr_priority_increase(thd_attr); + switch_threadattr_detach_set(thd_attr, 1); launch_dispatch_threads(1, DISPATCH_QUEUE_LEN, RUNTIME_POOL); switch_thread_create(&thread, thd_attr, switch_event_thread, EVENT_QUEUE[0], RUNTIME_POOL); Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Wed Oct 15 19:13:36 2008 @@ -398,6 +398,7 @@ switch_queue_create(&LOG_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, LOG_POOL); switch_mutex_init(&BINDLOCK, SWITCH_MUTEX_NESTED, LOG_POOL); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, log_thread, NULL, LOG_POOL); while (!THREAD_RUNNING) {

1 0

[commit] r10039 - freeswitch/trunk/src
by Freeswitch SVN 15 Oct '08

15 Oct '08

Author: mikej Date: Wed Oct 15 18:57:28 2008 New Revision: 10039 Modified: freeswitch/trunk/src/switch_core.c Log: plug massive leak Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Oct 15 18:57:28 2008 @@ -1541,6 +1541,7 @@ switch_threadattr_create(&thd_attr, sth->pool); switch_threadattr_stacksize_set(thd_attr, SWITCH_SYSTEM_THREAD_STACKSIZE); + switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); if (wait) {

1 0

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

15 Oct '08

Author: mikej Date: Wed Oct 15 18:16:18 2008 New Revision: 10038 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: make respond 302 work in mod_sofia Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Oct 15 18:16:18 2008 @@ -993,13 +993,16 @@ */ break; case SWITCH_MESSAGE_INDICATE_REDIRECT: - if (msg->string_arg) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg); - nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); + if (!switch_strlen_zero(msg->string_arg)) { + if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg); + nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for Re-directing to %s, already answered\n", msg->string_arg); + } } break; - case SWITCH_MESSAGE_INDICATE_DEFLECT: { char ref_to[128] = ""; @@ -1036,7 +1039,7 @@ code = 488; } - if (switch_strlen_zero(reason) && code != 407) { + if (switch_strlen_zero(reason) && code != 407 && code != 302) { reason = sip_status_phrase(code); if (switch_strlen_zero(reason)) { reason = "Because"; @@ -1074,6 +1077,13 @@ if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); } + } else if (code == 302 && !switch_strlen_zero(msg->string_arg)) { + char * p = strchr(msg->string_arg, ' '); + *p++ = '\0'; + msg->message_id = SWITCH_MESSAGE_INDICATE_REDIRECT; + msg->string_arg = p; + switch_core_session_receive_message(session, msg); + goto end; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason);

1 0