- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12369 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 10:58:24 2009 New Revision: 12369 Log: MODAPP-244 bkw stop trying to commit faster than me :P Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 10:58:24 2009 @@ -410,6 +410,14 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! + \brief Unsets private from a given channel + \param channel channel to unsets data from + \param key your private data's unique keyname + \return void pointer to channel's private data +*/ +SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); + +/*! \brief Assign a name to a given channel \param channel channel to assign name to \param name name to assign Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 3 10:58:24 2009 @@ -565,6 +565,18 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key) +{ + switch_status_t status; + switch_assert(channel != NULL); + + switch_mutex_lock(channel->profile_mutex); + status = switch_core_hash_delete(channel->private_hash, key); + switch_mutex_unlock(channel->profile_mutex); + + return status; +} + SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 10:58:24 2009 @@ -188,7 +188,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_set_private(channel, dh->file, NULL); + switch_channel_unset_private(channel, dh->file); } } break; @@ -269,7 +269,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_set_private(channel, dh->file, NULL); + switch_channel_unset_private(channel, dh->file); } } break;

1 0

[commit] r12368 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: brian Date: Tue Mar 3 10:55:07 2009 New Revision: 12368 Log: fix MODAPP-224 Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 10:55:07 2009 @@ -182,7 +182,14 @@ break; case SWITCH_ABC_TYPE_CLOSE: if (dh) { + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel; + switch_core_file_close(&dh->fh); + + if (session && (channel = switch_core_session_get_channel(session))) { + switch_channel_set_private(channel, dh->file, NULL); + } } break; case SWITCH_ABC_TYPE_READ_REPLACE: @@ -256,7 +263,14 @@ break; case SWITCH_ABC_TYPE_CLOSE: if (dh) { + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel; + switch_core_file_close(&dh->fh); + + if (session && (channel = switch_core_session_get_channel(session))) { + switch_channel_set_private(channel, dh->file, NULL); + } } break; case SWITCH_ABC_TYPE_WRITE_REPLACE:

1 0

[commit] r12367 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: anthm Date: Tue Mar 3 08:21:26 2009 New Revision: 12367 Log: MODAPP-225 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Mar 3 08:21:26 2009 @@ -2886,6 +2886,8 @@ args.buf = buf; args.buflen = sizeof(buf); + switch_ivr_sleep(session, 100, SWITCH_TRUE, NULL); + if (!switch_strlen_zero(greet_path)) { memset(buf, 0, sizeof(buf)); TRY_CODE(switch_ivr_play_file(session, NULL, greet_path, &args));

1 0

[commit] r12366 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: anthm Date: Tue Mar 3 08:17:28 2009 New Revision: 12366 Log: FSCORE-316 Modified: freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Mar 3 08:17:28 2009 @@ -1475,7 +1475,7 @@ break; } if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) { - if ((x + 3) >= len) { + if ((x + 3) > len) { break; } buf[x++] = '%';

1 0

[commit] r12365 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Mon Mar 2 19:52:25 2009 New Revision: 12365 Log: Add log message when the softtimer thread exits Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 2 19:52:25 2009 @@ -553,7 +553,7 @@ globals.RUNNING = 0; switch_mutex_unlock(globals.mutex); - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Soft timer thread exiting.\n"); return SWITCH_STATUS_TERM; }

1 0

[commit] r12364 - freeswitch/trunk/build
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mcollins Date: Mon Mar 2 18:28:16 2009 New Revision: 12364 Log: Add commented out mod_http to modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Mar 2 18:28:16 2009 @@ -7,6 +7,7 @@ applications/mod_enum applications/mod_fifo #applications/mod_fax +#applications/mod_http applications/mod_voicemail #applications/mod_lcr applications/mod_limit

1 0

[commit] r12363 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: anthm Date: Mon Mar 2 18:21:11 2009 New Revision: 12363 Log: doh Modified: freeswitch/trunk/src/switch_scheduler.c Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Mon Mar 2 18:21:11 2009 @@ -297,7 +297,7 @@ switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool); switch_threadattr_detach_set(thd_attr, 1); - switch_thread_create(task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool); + switch_thread_create(&task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool); } SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)

1 0

[commit] r12362 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: anthm Date: Mon Mar 2 17:59:04 2009 New Revision: 12362 Log: return nothing on timeout Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Mon Mar 2 17:59:04 2009 @@ -186,8 +186,7 @@ } } - last_event_obj = new ESLevent("server_disconnected"); - return last_event_obj; + return NULL; } int ESLconnection::filter(const char *header, const char *value)

1 0

[commit] r12361 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: anthm Date: Mon Mar 2 17:55:00 2009 New Revision: 12361 Log: FSCORE-297 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_scheduler.c freeswitch/trunk/src/switch_time.c 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 Mon Mar 2 17:55:00 2009 @@ -394,9 +394,9 @@ (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0, REG_INVITE, NULL); } - + if (auth_res != AUTH_OK) { - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + //switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); nua_respond(nh, SIP_401_UNAUTHORIZED, TAG_END()); goto done; } Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Mon Mar 2 17:55:00 2009 @@ -285,9 +285,11 @@ return delcnt; } +switch_thread_t *task_thread_p = NULL; + SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void) { - switch_thread_t *thread; + switch_threadattr_t *thd_attr; switch_core_new_memory_pool(&globals.memory_pool); @@ -295,7 +297,7 @@ switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool); switch_threadattr_detach_set(thd_attr, 1); - switch_thread_create(&thread, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool); + switch_thread_create(task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool); } SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void) @@ -303,8 +305,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping Task Thread\n"); if (globals.task_thread_running == 1) { int sanity = 0; + switch_status_t st; globals.task_thread_running = -1; + + switch_thread_join(&st, task_thread_p); while (globals.task_thread_running) { switch_yield(100000); Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 2 17:55:00 2009 @@ -174,7 +174,7 @@ SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t) { - if (t < 1000 || t >= 10000) { + if (!globals.RUNNING || t < 1000 || t >= 10000) { do_sleep(t); return; }

1 0

[commit] r12360 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: anthm Date: Mon Mar 2 16:19:36 2009 New Revision: 12360 Log: ESL-4 Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Mon Mar 2 16:19:36 2009 @@ -69,7 +69,8 @@ assert(cmd_buf); snprintf(cmd_buf, len, "api %s %s", cmd, arg ? arg : ""); - *(cmd_buf + len) = '\0'; + *(cmd_buf + (len + 1)) = '\0'; + if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) { esl_event_t *event;

1 0