- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2305 - freeswitch/branches/codemonkey
by Freeswitch SVN 16 Aug '06

16 Aug '06

Author: sphere Date: Wed Aug 16 01:45:26 2006 New Revision: 2305 Added: freeswitch/branches/codemonkey/ Log: Creating empty folder for codemonkey

1 0

[commit] r2304 - freeswitch/trunk/src
by Freeswitch SVN 16 Aug '06

16 Aug '06

Author: anthm Date: Tue Aug 15 20:54:38 2006 New Revision: 2304 Modified: freeswitch/trunk/src/switch_ivr.c Log: add assert Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 15 20:54:38 2006 @@ -439,7 +439,7 @@ comment, date); - + assert(read_codec != NULL); interval = read_codec->implementation->microseconds_per_frame / 1000;

1 0

[commit] r2303 - in freeswitch/trunk/src: . include mod/applications/mod_bridgecall mod/applications/mod_conference
by Freeswitch SVN 16 Aug '06

16 Aug '06

Author: anthm Date: Tue Aug 15 20:35:02 2006 New Revision: 2303 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr.c Log: consolidate code in conference into todays changes Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Aug 15 20:35:02 2006 @@ -169,11 +169,17 @@ \param session originating session \param bleg B leg session \param bridgeto the desired remote callstring + \param table optional state handler table to install on the channel + \param cid_name_override override the caller id name + \param cid_num_override override the caller id number \return SWITCH_STATUS_SUCCESS if bleg is a running session. */ -SWITCH_DECLARE(switch_status_t) switch_ivr_outcall(switch_core_session_t *session, - switch_core_session_t **bleg, - char *bridgeto); +SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *session, + switch_core_session_t **bleg, + char *bridgeto, + const switch_state_handler_table_t *table, + char *cid_name_override, + char *cid_num_override); /*! \brief Bridge Audio from one session to another Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Aug 15 20:35:02 2006 @@ -45,7 +45,7 @@ caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); - if (switch_ivr_outcall(session, &peer_session, data) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, &peer_session, data, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); return; Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Aug 15 20:35:02 2006 @@ -1974,148 +1974,32 @@ static switch_status_t conference_outcall(conference_obj_t *conference, switch_core_session_t *session, char *bridgeto, char *cid_name, char *cid_num) { switch_core_session_t *peer_session; - switch_caller_profile_t *caller_profile, *caller_caller_profile; - char *chan_type, *chan_data; - unsigned int timelimit = 60; switch_channel_t *peer_channel; - time_t start; - switch_frame_t *read_frame = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *caller_channel = NULL; - chan_type = strdup(bridgeto); - - if ((chan_data = strchr(chan_type, '/')) != 0) { - *chan_data = '\0'; - chan_data++; - } - - if (session) { - caller_channel = switch_core_session_get_channel(session); - assert(caller_channel != NULL); - caller_caller_profile = switch_channel_get_caller_profile(caller_channel); - if (!cid_name) { - cid_name = caller_caller_profile->caller_id_name; - } - - if (!cid_num) { - cid_num = caller_caller_profile->caller_id_number; - } - - caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - caller_caller_profile->username, - caller_caller_profile->dialplan, - cid_name, - cid_num, - caller_caller_profile->network_addr, - NULL, - NULL, - caller_caller_profile->rdnis, - caller_caller_profile->source, - caller_caller_profile->context, - chan_data); - } else { - - if (!cid_name) { - cid_name = conference->caller_id_name; - } - - if (!cid_num) { - cid_num = conference->caller_id_number; - } - - caller_profile = switch_caller_profile_new(conference->pool, - NULL, - NULL, - cid_name, - cid_num, - NULL, - NULL, - NULL, - NULL, - (char *) global_app_name, - NULL, - chan_data); - } - - - - if (switch_core_session_outgoing_channel(session, chan_type, caller_profile, &peer_session, NULL) != - SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, &peer_session, bridgeto, &audio_bridge_peer_state_handlers, cid_name, cid_num) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); - if (caller_channel) { + if (session) { + caller_channel = switch_core_session_get_channel(session); switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); } - status = SWITCH_STATUS_FALSE; goto done; } + + switch_core_session_rwunlock(peer_session); peer_channel = switch_core_session_get_channel(peer_session); assert(peer_channel != NULL); - - switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); - - if (switch_core_session_runing(peer_session)) { - switch_channel_set_state(peer_channel, CS_RING); - } else { - switch_core_session_thread_launch(peer_session); - } - - time(&start); - - for (;;) { - int state = switch_channel_get_state(peer_channel); - if (state >= CS_RING) { - break; - } - - if (caller_channel && !switch_channel_ready(caller_channel)) { - break; - } - - if ((time(NULL) - start) > (time_t)timelimit) { - break; - } - switch_yield(1000); - } - - if (caller_channel) { - switch_channel_pre_answer(caller_channel); - } - - while ((!caller_channel || switch_channel_ready(caller_channel)) && - !switch_channel_test_flag(peer_channel, CF_ANSWERED) && - !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) && - ((time(NULL) - start) < (time_t)timelimit)) { - - /* read from the channel while we wait if the audio is up on it */ - if (session && (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { - switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); - - if (!SWITCH_READ_ACCEPTABLE(status)) { - break; - } - if (read_frame) { - if (switch_core_session_write_frame(session, read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { - break; - } - } - - } else { - switch_yield(1000); - } - - } - + if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) { switch_channel_answer(caller_channel); } if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { switch_caller_extension_t *extension = NULL; - if ((extension = switch_caller_extension_new(peer_session, caller_profile->destination_number, - caller_profile->destination_number)) == 0) { + if ((extension = switch_caller_extension_new(peer_session, conference->name, conference->name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); status = SWITCH_STATUS_MEMERR; goto done; @@ -2132,7 +2016,6 @@ } done: - free(chan_type); return status; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 15 20:35:02 2006 @@ -1142,9 +1142,12 @@ -SWITCH_DECLARE(switch_status_t) switch_ivr_outcall(switch_core_session_t *session, - switch_core_session_t **bleg, - char *bridgeto) +SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *session, + switch_core_session_t **bleg, + char *bridgeto, + const switch_state_handler_table_t *table, + char *cid_name_override, + char *cid_num_override) { switch_core_session_t *peer_session; @@ -1170,12 +1173,18 @@ assert(caller_channel != NULL); caller_caller_profile = switch_channel_get_caller_profile(caller_channel); + if (!cid_name_override) { + cid_name_override = caller_caller_profile->caller_id_name; + } + if (!cid_num_override) { + cid_num_override = caller_caller_profile->caller_id_number; + } caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), caller_caller_profile->username, caller_caller_profile->dialplan, - caller_caller_profile->caller_id_name, - caller_caller_profile->caller_id_number, + cid_name_override, + cid_num_override, caller_caller_profile->network_addr, NULL, NULL, @@ -1184,12 +1193,17 @@ caller_caller_profile->context, chan_data); } else { - + if (!cid_name_override) { + cid_name_override = "FreeSWITCH"; + } + if (!cid_num_override) { + cid_num_override = "0000000000"; + } caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, NULL, - "FreeSWITCH", - "0000000000", + cid_name_override, + cid_num_override, NULL, NULL, NULL, @@ -1212,8 +1226,12 @@ peer_channel = switch_core_session_get_channel(peer_session); assert(peer_channel != NULL); - switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); + if (!table) { + table = &audio_bridge_peer_state_handlers; + } + switch_channel_add_state_handler(peer_channel, table); + if (switch_core_session_runing(peer_session)) { switch_channel_set_state(peer_channel, CS_RING); } else { @@ -1246,7 +1264,7 @@ !switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) && ((time(NULL) - start) < (time_t)timelimit)) { - + /* read from the channel while we wait if the audio is up on it */ if (session && (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); @@ -1263,7 +1281,7 @@ } else { switch_yield(1000); } - + } if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) { @@ -1277,6 +1295,7 @@ switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ANSWER); status = SWITCH_STATUS_FALSE; } + done: free(chan_type);

1 0

[commit] r2302 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: anthm Date: Tue Aug 15 18:19:38 2006 New Revision: 2302 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add proper shutdown to mod_conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Aug 15 18:19:38 2006 @@ -53,6 +53,8 @@ switch_mutex_t *id_mutex; switch_mutex_t *hash_mutex; uint32_t id_pool; + int32_t running; + uint32_t threads; } globals; struct conference_member; @@ -451,7 +453,9 @@ return NULL; } - while(!switch_test_flag(conference, CFLAG_DESTRUCT)) { + globals.threads++; + + while(globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) { uint8_t file_frame[CONF_BUFFER_SIZE] = {0}; switch_size_t file_sample_len = samples; switch_size_t file_data_len = samples * 2; @@ -654,7 +658,8 @@ switch_core_destroy_memory_pool(&pool); } } - + + globals.threads--; return NULL; } @@ -2908,6 +2913,22 @@ /* Release the config registry handle */ switch_xml_free(cxml); + globals.running = 1; /* indicate that the module should continue to be loaded */ return status; +} + + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + + + if (globals.running) { + globals.running = 0; + while (globals.threads) { + switch_yield(100000); + } + } + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2301 - in freeswitch/trunk/src: . mod/applications/mod_bridgecall
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: anthm Date: Tue Aug 15 17:38:24 2006 New Revision: 2301 Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: redecorating Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Aug 15 17:38:24 2006 @@ -40,42 +40,17 @@ { switch_channel_t *caller_channel; switch_core_session_t *peer_session; - switch_caller_profile_t *caller_profile, *caller_caller_profile; - char chan_type[128] = { '\0' }, *chan_data; - unsigned int timelimit = 60; /* probably a useful option to pass in when there's time */ + unsigned int timelimit = 60; /* probably a useful option to pass in when there's time */ + caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); - - strncpy(chan_type, data, sizeof(chan_type)); - - if ((chan_data = strchr(chan_type, '/')) != 0) { - *chan_data = '\0'; - chan_data++; - } - - caller_caller_profile = switch_channel_get_caller_profile(caller_channel); - caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - caller_caller_profile->username, - caller_caller_profile->dialplan, - caller_caller_profile->caller_id_name, - caller_caller_profile->caller_id_number, - caller_caller_profile->network_addr, - NULL, - NULL, - caller_caller_profile->rdnis, - caller_caller_profile->source, - caller_caller_profile->context, - chan_data); - - - - if (switch_core_session_outgoing_channel(session, chan_type, caller_profile, &peer_session, NULL) != - SWITCH_STATUS_SUCCESS) { + if (switch_ivr_outcall(session, &peer_session, data) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); return; } else { + /* peer channel is read locked now the bridge func will unlock it for us */ switch_ivr_multi_threaded_bridge(session, peer_session, timelimit, NULL, NULL, NULL); } } Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Aug 15 17:38:24 2006 @@ -220,7 +220,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); switch_core_session_hupall(); - switch_yield(10000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); switch_loadable_module_shutdown(); switch_core_destroy(); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Aug 15 17:38:24 2006 @@ -762,9 +762,14 @@ SWITCH_DECLARE(int) switch_channel_add_state_handler(switch_channel_t *channel, const switch_state_handler_table_t *state_handler) { - int index; + int x, index; assert(channel != NULL); + for (x = 0; x < SWITCH_MAX_STATE_HANDLERS; x++) { + if (channel->state_handlers[x] == state_handler) { + return x; + } + } index = channel->state_handler_index++; if (channel->state_handler_index >= SWITCH_MAX_STATE_HANDLERS) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Aug 15 17:38:24 2006 @@ -233,7 +233,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock(switch_core_session_t *session) { - return (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock); + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (!switch_channel_test_flag(session->channel, CF_LOCK_THREAD)) { + if ((status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock)) == SWITCH_STATUS_SUCCESS) { + switch_channel_set_flag(session->channel, CF_LOCK_THREAD); + } + } + + return status; } SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session) @@ -243,6 +251,7 @@ SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session) { + switch_channel_clear_flag(session->channel, CF_LOCK_THREAD); switch_thread_rwlock_unlock(session->rwlock); } @@ -283,7 +292,7 @@ switch_mutex_unlock(runtime.session_table_mutex); while(runtime.session_count) { - switch_yield(1000); + switch_yield(10000); } } @@ -3116,15 +3125,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void) { - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); switch_event_shutdown(); switch_queue_push(runtime.sql_queue, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n"); while (switch_queue_size(runtime.sql_queue) > 0) { - switch_yield(1000); + switch_yield(10000); } switch_core_db_close(runtime.db); switch_core_db_close(runtime.event_db); @@ -3132,15 +3139,15 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n"); switch_log_shutdown(); - - if (runtime.memory_pool) { - apr_pool_destroy(runtime.memory_pool); - apr_terminate(); - } if(runtime.console != stdout && runtime.console != stderr) { fclose(runtime.console); runtime.console = NULL; + } + + if (runtime.memory_pool) { + apr_pool_destroy(runtime.memory_pool); + apr_terminate(); } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 15 17:38:24 2006 @@ -1177,8 +1177,8 @@ caller_caller_profile->caller_id_name, caller_caller_profile->caller_id_number, caller_caller_profile->network_addr, + NULL, NULL, - NULL, caller_caller_profile->rdnis, caller_caller_profile->source, caller_caller_profile->context, @@ -1207,6 +1207,8 @@ goto done; } + switch_core_session_read_lock(peer_session); + peer_channel = switch_core_session_get_channel(peer_session); assert(peer_channel != NULL); @@ -1294,12 +1296,9 @@ { switch_core_thread_session_t *this_audio_thread, *other_audio_thread; switch_channel_t *caller_channel, *peer_channel; - time_t start; int stream_id = 0; - switch_frame_t *read_frame = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; - caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); @@ -1328,59 +1327,6 @@ this_audio_thread->running = 2; switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); - - if (switch_core_session_runing(peer_session)) { - switch_channel_set_state(peer_channel, CS_RING); - } else { - switch_core_session_thread_launch(peer_session); - } - - time(&start); - - for (;;) { - int state = switch_channel_get_state(peer_channel); - if (state >= CS_RING) { - break; - } - - if (!switch_channel_ready(caller_channel)) { - break; - } - - if ((time(NULL) - start) > (time_t)timelimit) { - break; - } - switch_yield(1000); - } - - switch_channel_pre_answer(caller_channel); - - - while (switch_channel_ready(caller_channel) && - switch_channel_ready(peer_channel) && - !switch_channel_test_flag(peer_channel, CF_ANSWERED) && - !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) && - ((time(NULL) - start) < (time_t)timelimit)) { - - /* read from the channel while we wait if the audio is up on it */ - if (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { - switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); - - if (!SWITCH_READ_ACCEPTABLE(status)) { - break; - } - if (read_frame) { - //memset(read_frame->data, 0, read_frame->datalen); - if (switch_core_session_write_frame(session, read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { - break; - } - } - - } else { - switch_yield(1000); - } - - } if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) { switch_channel_answer(caller_channel);

1 0

[commit] r2300 - in freeswitch/trunk/src: . include
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: anthm Date: Tue Aug 15 15:38:14 2006 New Revision: 2300 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr.c Log: setting waypoint Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Aug 15 15:38:14 2006 @@ -164,6 +164,16 @@ void *buf, unsigned int buflen); +/*! + \brief Make an outgoing call + \param session originating session + \param bleg B leg session + \param bridgeto the desired remote callstring + \return SWITCH_STATUS_SUCCESS if bleg is a running session. +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_outcall(switch_core_session_t *session, + switch_core_session_t **bleg, + char *bridgeto); /*! \brief Bridge Audio from one session to another Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 15 15:38:14 2006 @@ -1141,6 +1141,147 @@ }; + +SWITCH_DECLARE(switch_status_t) switch_ivr_outcall(switch_core_session_t *session, + switch_core_session_t **bleg, + char *bridgeto) + +{ + switch_core_session_t *peer_session; + switch_caller_profile_t *caller_profile, *caller_caller_profile; + char *chan_type, *chan_data; + unsigned int timelimit = 60; + switch_channel_t *peer_channel; + time_t start; + switch_frame_t *read_frame = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_channel_t *caller_channel = NULL; + + *bleg = NULL; + chan_type = strdup(bridgeto); + + if ((chan_data = strchr(chan_type, '/')) != 0) { + *chan_data = '\0'; + chan_data++; + } + + if (session) { + caller_channel = switch_core_session_get_channel(session); + assert(caller_channel != NULL); + caller_caller_profile = switch_channel_get_caller_profile(caller_channel); + + + caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + caller_caller_profile->username, + caller_caller_profile->dialplan, + caller_caller_profile->caller_id_name, + caller_caller_profile->caller_id_number, + caller_caller_profile->network_addr, + NULL, + NULL, + caller_caller_profile->rdnis, + caller_caller_profile->source, + caller_caller_profile->context, + chan_data); + } else { + + caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + NULL, + NULL, + "FreeSWITCH", + "0000000000", + NULL, + NULL, + NULL, + NULL, + __FILE__, + NULL, + chan_data); + } + + + + if (switch_core_session_outgoing_channel(session, chan_type, caller_profile, &peer_session, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + + peer_channel = switch_core_session_get_channel(peer_session); + assert(peer_channel != NULL); + + switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); + + if (switch_core_session_runing(peer_session)) { + switch_channel_set_state(peer_channel, CS_RING); + } else { + switch_core_session_thread_launch(peer_session); + } + + time(&start); + + for (;;) { + int state = switch_channel_get_state(peer_channel); + if (state >= CS_RING) { + break; + } + + if (caller_channel && !switch_channel_ready(caller_channel)) { + break; + } + + if ((time(NULL) - start) > (time_t)timelimit) { + break; + } + switch_yield(1000); + } + + if (caller_channel) { + switch_channel_pre_answer(caller_channel); + } + + while ((!caller_channel || switch_channel_ready(caller_channel)) && + !switch_channel_test_flag(peer_channel, CF_ANSWERED) && + !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) && + ((time(NULL) - start) < (time_t)timelimit)) { + + /* read from the channel while we wait if the audio is up on it */ + if (session && (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA))) { + switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + if (read_frame) { + if (switch_core_session_write_frame(session, read_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { + break; + } + } + + } else { + switch_yield(1000); + } + + } + + if (caller_channel && switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + switch_channel_answer(caller_channel); + } + + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { + *bleg = peer_session; + status = SWITCH_STATUS_SUCCESS; + } else { + switch_channel_hangup(peer_channel, SWITCH_CAUSE_NO_ANSWER); + status = SWITCH_STATUS_FALSE; + } + + done: + free(chan_type); + return status; +} + + SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_session_t *session, switch_core_session_t *peer_session, unsigned int timelimit,

1 0

[commit] r2299 - freeswitch/trunk/src
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: anthm Date: Tue Aug 15 15:02:06 2006 New Revision: 2299 Modified: freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_log.c Log: tweak shutdown process Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Aug 15 15:02:06 2006 @@ -220,12 +220,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); switch_core_session_hupall(); + switch_yield(10000); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); switch_loadable_module_shutdown(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Tearing down environment.\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Exiting Now.\n"); switch_core_destroy(); - - return 0; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Aug 15 15:02:06 2006 @@ -3116,10 +3116,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); - switch_event_shutdown(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); + switch_event_shutdown(); + switch_queue_push(runtime.sql_queue, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n"); while (switch_queue_size(runtime.sql_queue) > 0) { @@ -3128,10 +3129,11 @@ switch_core_db_close(runtime.db); switch_core_db_close(runtime.event_db); switch_xml_destroy(); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n"); switch_log_shutdown(); - switch_yield(10000); + if (runtime.memory_pool) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Unallocating memory pool.\n"); apr_pool_destroy(runtime.memory_pool); apr_terminate(); } Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Tue Aug 15 15:02:06 2006 @@ -118,7 +118,7 @@ assert(obj == NULL || obj != NULL); THREAD_RUNNING = 1; - while(LOG_QUEUE) { + while(THREAD_RUNNING == 1) { void *pop = NULL; switch_log_node_t *node = NULL; switch_log_binding_t *binding; @@ -128,7 +128,6 @@ } if (!pop) { - LOG_QUEUE = NULL; break; } @@ -277,7 +276,11 @@ SWITCH_DECLARE(switch_status_t) switch_log_shutdown(void) { + THREAD_RUNNING = -1; switch_queue_push(LOG_QUEUE, NULL); + while (THREAD_RUNNING) { + switch_yield(1000); + } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2298 - in freeswitch/trunk/src: . include
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: anthm Date: Tue Aug 15 13:52:12 2006 New Revision: 2298 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_log.c Log: performance tweaks Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Aug 15 13:52:12 2006 @@ -86,7 +86,7 @@ typedef struct switch_directories switch_directories; SWITCH_DECLARE_DATA extern switch_directories SWITCH_GLOBAL_dirs; -#define SWITCH_THREAD_STACKSIZE 512 * 1024 +#define SWITCH_THREAD_STACKSIZE 384 * 1024 #define SWITCH_RECCOMMENDED_BUFFER_SIZE 2048 #define SWITCH_MAX_CODECS 30 #define SWITCH_MAX_STATE_HANDLERS 30 Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Aug 15 13:52:12 2006 @@ -225,5 +225,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Tearing down environment.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Exiting Now.\n"); switch_core_destroy(); + + return 0; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Aug 15 13:52:12 2006 @@ -3118,8 +3118,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); switch_event_shutdown(); - switch_log_shutdown(); + switch_queue_push(runtime.sql_queue, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n"); while (switch_queue_size(runtime.sql_queue) > 0) { @@ -3128,7 +3128,8 @@ switch_core_db_close(runtime.db); switch_core_db_close(runtime.event_db); switch_xml_destroy(); - + switch_log_shutdown(); + switch_yield(10000); if (runtime.memory_pool) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Unallocating memory pool.\n"); apr_pool_destroy(runtime.memory_pool); Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Tue Aug 15 13:52:12 2006 @@ -118,7 +118,7 @@ assert(obj == NULL || obj != NULL); THREAD_RUNNING = 1; - for(;;) { + while(LOG_QUEUE) { void *pop = NULL; switch_log_node_t *node = NULL; switch_log_binding_t *binding; @@ -128,6 +128,7 @@ } if (!pop) { + LOG_QUEUE = NULL; break; } @@ -222,23 +223,23 @@ switch_event_fire(&event); } } else { - if (level == SWITCH_LOG_CONSOLE || !THREAD_RUNNING) { + if (level == SWITCH_LOG_CONSOLE || !LOG_QUEUE || !THREAD_RUNNING) { fprintf(handle, data); - } - - if (level <= MAX_LEVEL) { - switch_log_node_t *node = malloc(sizeof(*node)); - node->data = data; - node->file = strdup(filep); - node->func = strdup(func); - node->line = line; - node->level = level; - node->content = content; - node->timestamp = now; - switch_queue_push(LOG_QUEUE, node); - } else { free(data); - } + } else if (level <= MAX_LEVEL) { + switch_log_node_t *node; + + if ((node = malloc(sizeof(*node)))) { + node->data = data; + node->file = strdup(filep); + node->func = strdup(func); + node->line = line; + node->level = level; + node->content = content; + node->timestamp = now; + switch_queue_push(LOG_QUEUE, node); + } + } } }

1 0

[commit] r2297 - freeswitch/trunk/src
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: mikej Date: Tue Aug 15 12:17:03 2006 New Revision: 2297 Modified: freeswitch/trunk/src/switch_event.c Log: make vsnprintf check work Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Aug 15 12:17:03 2006 @@ -443,12 +443,12 @@ va_list ap; if (fmt) { va_start(ap, fmt); - vsnprintf(data, sizeof(data), fmt, ap); + ret = vsnprintf(data, sizeof(data), fmt, ap); va_end(ap); } if (ret == -1) { - return SWITCH_STATUS_MEMERR; + return SWITCH_STATUS_GENERR; } else { event->body = DUP(data); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r2296 - freeswitch/trunk/src
by Freeswitch SVN 15 Aug '06

15 Aug '06

Author: mikej Date: Tue Aug 15 11:57:20 2006 New Revision: 2296 Modified: freeswitch/trunk/src/switch_event.c Log: fix segfault Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Aug 15 11:57:20 2006 @@ -441,9 +441,11 @@ char data[2048]; va_list ap; - va_start(ap, fmt); - vsnprintf(data, sizeof(data), fmt, ap); - va_end(ap); + if (fmt) { + va_start(ap, fmt); + vsnprintf(data, sizeof(data), fmt, ap); + va_end(ap); + } if (ret == -1) { return SWITCH_STATUS_MEMERR;

1 0