January 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7141 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/formats/mod_local_stream
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 13:35:51 2008 New Revision: 7141 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c Log: leak protection, better than mighty putty Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Jan 8 13:35:51 2008 @@ -1135,12 +1135,16 @@ \return SWITCH_STATUS_SUCCESS if the file is opened \note the loadable module used is chosen based on the file extension */ -SWITCH_DECLARE(switch_status_t) switch_core_file_open(_In_ switch_file_handle_t *fh, - _In_z_ const char *file_path, - _In_ uint8_t channels, - _In_ uint32_t rate, - _In_ unsigned int flags, - _In_opt_ switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line, + _In_ switch_file_handle_t *fh, + _In_z_ const char *file_path, + _In_ uint8_t channels, + _In_ uint32_t rate, + _In_ unsigned int flags, + _In_opt_ switch_memory_pool_t *pool); +#define switch_core_file_open(_fh, _file_path, _channels, _rate, _flags, _pool) \ + switch_core_perform_file_open(__FILE__, __SWITCH_FUNC__, __LINE__, _fh, _file_path, _channels, _rate, _flags, _pool) + /*! \brief Read media from a file handle \param fh the file handle to read from (must be initilized by you memset all 0 for read, fill in channels and rate for write) Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Tue Jan 8 13:35:51 2008 @@ -301,6 +301,9 @@ switch_buffer_t *buffer; switch_byte_t *dbuf; switch_size_t dbuflen; + const char *file; + const char *func; + int line; }; /*! \brief Abstract interface to an asr module */ 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 Jan 8 13:35:51 2008 @@ -979,64 +979,63 @@ switch_event_fire(&event); } - switch_core_timer_destroy(&timer); - - if (switch_test_flag(conference, CFLAG_DESTRUCT)) { - - switch_mutex_lock(conference->mutex); - conference_stop_file(conference, FILE_STOP_ASYNC); - conference_stop_file(conference, FILE_STOP_ALL); - /* Close Unused Handles */ - if (conference->fnode) { - conference_file_node_t *fnode, *cur; - switch_memory_pool_t *pool; + - fnode = conference->fnode; - while (fnode) { - cur = fnode; - fnode = fnode->next; + switch_mutex_lock(conference->mutex); + conference_stop_file(conference, FILE_STOP_ASYNC); + conference_stop_file(conference, FILE_STOP_ALL); + /* Close Unused Handles */ + if (conference->fnode) { + conference_file_node_t *fnode, *cur; + switch_memory_pool_t *pool; - if (cur->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&cur->fh); - } + fnode = conference->fnode; + while (fnode) { + cur = fnode; + fnode = fnode->next; - pool = cur->pool; - switch_core_destroy_memory_pool(&pool); + if (cur->type != NODE_TYPE_SPEECH) { + switch_core_file_close(&cur->fh); } - conference->fnode = NULL; - } - if (conference->async_fnode) { - switch_memory_pool_t *pool; - switch_core_file_close(&conference->async_fnode->fh); - pool = conference->async_fnode->pool; - conference->async_fnode = NULL; - switch_core_destroy_memory_pool(&pool); + pool = cur->pool; + switch_core_destroy_memory_pool(&pool); } + conference->fnode = NULL; + } - switch_mutex_lock(conference->member_mutex); - for (imember = conference->members; imember; imember = imember->next) { - switch_channel_t *channel; + if (conference->async_fnode) { + switch_memory_pool_t *pool; + switch_core_file_close(&conference->async_fnode->fh); + pool = conference->async_fnode->pool; + conference->async_fnode = NULL; + switch_core_destroy_memory_pool(&pool); + } - if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) { - channel = switch_core_session_get_channel(imember->session); + switch_mutex_lock(conference->member_mutex); + for (imember = conference->members; imember; imember = imember->next) { + switch_channel_t *channel; - /* add this little bit to preserve the bridge cause code in case of an early media call that */ - /* never answers */ - if (switch_test_flag(conference, CFLAG_ANSWERED)) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - } else { - /* put actual cause code from outbound channel hangup here */ - switch_channel_hangup(channel, conference->bridge_hangup_cause); - } - } + if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) { + channel = switch_core_session_get_channel(imember->session); - switch_clear_flag_locked(imember, MFLAG_RUNNING); + /* add this little bit to preserve the bridge cause code in case of an early media call that */ + /* never answers */ + if (switch_test_flag(conference, CFLAG_ANSWERED)) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + } else { + /* put actual cause code from outbound channel hangup here */ + switch_channel_hangup(channel, conference->bridge_hangup_cause); + } } - switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(conference->mutex); + switch_clear_flag_locked(imember, MFLAG_RUNNING); + } + switch_mutex_unlock(conference->member_mutex); + switch_mutex_unlock(conference->mutex); + if (switch_test_flag(conference, CFLAG_DESTRUCT)) { + switch_core_timer_destroy(&timer); switch_mutex_lock(globals.hash_mutex); switch_core_hash_delete(globals.conference_hash, conference->name); switch_mutex_unlock(globals.hash_mutex); 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 Tue Jan 8 13:35:51 2008 @@ -51,6 +51,9 @@ switch_mutex_t *audio_mutex; switch_buffer_t *audio_buffer; int err; + const char *file; + const char *func; + int line; struct local_stream_context *next; }; typedef struct local_stream_context local_stream_context_t; @@ -191,14 +194,20 @@ switch_buffer_write(audio_buffer, abuf, olen * 2); used = switch_buffer_inuse(audio_buffer); - + if (used >= source->prebuf || (source->total && used > source->samples * 2)) { used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2); if (source->total) { + switch_mutex_lock(source->mutex); for (cp = source->context_list; cp; cp = cp->next) { switch_mutex_lock(cp->audio_mutex); - switch_buffer_write(cp->audio_buffer, dist_buf, used); + if (switch_buffer_inuse(cp->audio_buffer) > source->samples * 128) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Leaking stream handle! [%s() %s:%d]\n", cp->func, cp->file, cp->line); + switch_buffer_zero(cp->audio_buffer); + } else { + switch_buffer_write(cp->audio_buffer, dist_buf, used); + } switch_mutex_unlock(cp->audio_mutex); } switch_mutex_unlock(source->mutex); @@ -277,6 +286,9 @@ } context->source = source; + context->file = handle->file; + context->func = handle->func; + context->line = handle->line; switch_mutex_lock(source->mutex); context->next = source->context_list; Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Tue Jan 8 13:35:51 2008 @@ -34,8 +34,13 @@ #include <switch.h> #include "private/switch_core_pvt.h" -SWITCH_DECLARE(switch_status_t) switch_core_file_open(switch_file_handle_t *fh, - const char *file_path, uint8_t channels, uint32_t rate, unsigned int flags, switch_memory_pool_t *pool) +SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line, + switch_file_handle_t *fh, + const char *file_path, + uint8_t channels, + uint32_t rate, + unsigned int flags, + switch_memory_pool_t *pool) { char *ext; switch_status_t status; @@ -63,6 +68,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid file format [%s] for [%s]!\n", ext, file_path); return SWITCH_STATUS_GENERR; } + + fh->file = file; + fh->func = func; + fh->line = line; fh->flags = flags; if (pool) {

1 0

[commit] r7140 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 12:18:04 2008 New Revision: 7140 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: there are no small problems only small fixes 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 Jan 8 12:18:04 2008 @@ -1496,6 +1496,7 @@ switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOMEDIA"); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_channel_set_state(channel, CS_INIT); + switch_set_flag(tech_pvt, TFLAG_SDP); goto done; } else { sdp_parser_t *parser;

1 0

[commit] r7139 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: anthm Date: Tue Jan 8 11:35:20 2008 New Revision: 7139 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix shutdown issues 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 Tue Jan 8 11:35:20 2008 @@ -546,6 +546,11 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); + if (!(tech_pvt->profile->pflags & PFLAG_RUNNING)) { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_NORMAL_CLEARING); + return SWITCH_STATUS_FALSE; + } + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } 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 Jan 8 11:35:20 2008 @@ -535,13 +535,23 @@ switch_thread_rwlock_wrlock(profile->rwlock); sofia_reg_unregister(profile); nua_shutdown(profile->nua); - su_root_run(profile->s_root); + + while(profile->inuse) { + switch_yield(100000); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "waiting for %d session(s)\n", profile->inuse); + } nua_destroy(profile->nua); switch_mutex_lock(profile->ireg_mutex); switch_mutex_unlock(profile->ireg_mutex); + switch_mutex_lock(profile->flag_mutex); + switch_mutex_unlock(profile->flag_mutex); + + + + if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : ""); @@ -2250,7 +2260,7 @@ int is_auth = 0, calling_myself = 0; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); - if (sess_count >= sess_max) { + if (sess_count >= sess_max || !(profile->pflags & PFLAG_RUNNING)) { nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); return; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Jan 8 11:35:20 2008 @@ -1801,6 +1801,9 @@ switch_mutex_lock(mod_sofia_globals.hash_mutex); if ((profile = (sofia_profile_t *) switch_core_hash_find(mod_sofia_globals.profile_hash, key))) { + if (!(profile->pflags & PFLAG_RUNNING)) { + return NULL; + } if (switch_thread_rwlock_tryrdlock(profile->rwlock) != SWITCH_STATUS_SUCCESS) { #ifdef SOFIA_DEBUG_RWLOCKS switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_ERROR, "Profile %s is locked\n", profile->name); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Jan 8 11:35:20 2008 @@ -1052,6 +1052,9 @@ switch_mutex_lock(mod_sofia_globals.hash_mutex); if ((gateway = (sofia_gateway_t *) switch_core_hash_find(mod_sofia_globals.gateway_hash, key))) { + if (!(gateway->profile->pflags & PFLAG_RUNNING)) { + return NULL; + } if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "Profile %s is locked\n", gateway->profile->name); gateway = NULL;

1 0

[commit] r7138 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Tue Jan 8 11:20:00 2008 New Revision: 7138 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: don't set blank vars, and handle them in error cases. Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Jan 8 11:20:00 2008 @@ -454,7 +454,7 @@ if (!switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); - if (value) { + if (!switch_strlen_zero(value)) { switch_event_add_header(channel->variables, SWITCH_STACK_BOTTOM, varname, "%s", value); } switch_mutex_unlock(channel->profile_mutex); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jan 8 11:20:00 2008 @@ -1323,7 +1323,7 @@ if (!hi) return off; for (; hi; hi = hi->next) { - if (hi->name && hi->value && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { + if (!switch_strlen_zero(hi->name) && !switch_strlen_zero(hi->value) && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { char *data; switch_size_t dlen = strlen(hi->value) * 3;

1 0

[commit] r7137 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: stkn Date: Tue Jan 8 05:57:42 2008 New Revision: 7137 Modified: freeswitch/trunk/src/switch.c Log: Look! A whitespace fix snuck into the tree! Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Jan 8 05:57:42 2008 @@ -451,7 +451,7 @@ pid_len = sizeof(pid_buffer); apr_pool_create(&pool, NULL); - if (switch_file_open(&fd, + if (switch_file_open(&fd, pid_path, SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE,

1 0

[commit] r7136 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Tue Jan 8 00:24:49 2008 New Revision: 7136 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: add \n 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 Jan 8 00:24:49 2008 @@ -538,7 +538,7 @@ if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { reply = stream.data; } else { - freply = switch_mprintf("%s: Command not found!", acs->api_cmd); + freply = switch_mprintf("%s: Command not found!\n", acs->api_cmd); reply = freply; }

1 0

[commit] r7135 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jan '08

08 Jan '08

Author: mikej Date: Mon Jan 7 22:00:57 2008 New Revision: 7135 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: avoid file handle leak 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 Mon Jan 7 22:00:57 2008 @@ -984,7 +984,8 @@ if (switch_test_flag(conference, CFLAG_DESTRUCT)) { switch_mutex_lock(conference->mutex); - + conference_stop_file(conference, FILE_STOP_ASYNC); + conference_stop_file(conference, FILE_STOP_ALL); /* Close Unused Handles */ if (conference->fnode) { conference_file_node_t *fnode, *cur; @@ -1005,6 +1006,14 @@ conference->fnode = NULL; } + if (conference->async_fnode) { + switch_memory_pool_t *pool; + switch_core_file_close(&conference->async_fnode->fh); + pool = conference->async_fnode->pool; + conference->async_fnode = NULL; + switch_core_destroy_memory_pool(&pool); + } + switch_mutex_lock(conference->member_mutex); for (imember = conference->members; imember; imember = imember->next) { switch_channel_t *channel; @@ -2782,7 +2791,7 @@ static switch_status_t conf_api_sub_list(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { int ret_status = SWITCH_STATUS_GENERR; - + int count = 0; switch_hash_index_t *hi; void *val; char *d = ";"; @@ -2816,6 +2825,7 @@ stream->write_function(stream, "Conference %s (%u member%s%s)\n", conference->name, conference->count, conference->count == 1 ? "" : "s", switch_test_flag(conference, CFLAG_LOCKED) ? " locked" : ""); + count++; if (pretty) { conference_list_pretty(conference, stream); } else { @@ -2823,6 +2833,7 @@ } } } else { + count++; if (pretty) { conference_list_pretty(conference, stream); } else { @@ -2830,6 +2841,10 @@ } } + if (!count) { + stream->write_function(stream, "No active conferences.\n"); + } + ret_status = SWITCH_STATUS_SUCCESS; return ret_status;

1 0

[commit] r7134 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 16:47:32 2008 New Revision: 7134 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: add pre_answer calls to some funcs in the ivr lib to ensure media for obvious situations that require it 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 Mon Jan 7 16:47:32 2008 @@ -356,6 +356,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + switch_channel_pre_answer(channel); + read_codec = switch_core_session_get_read_codec(session); switch_assert(read_codec != NULL); @@ -691,6 +693,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + switch_channel_pre_answer(channel); + prefix = switch_channel_get_variable(channel, "sound_prefix"); timer_name = switch_channel_get_variable(channel, "timer_name"); @@ -1130,7 +1134,7 @@ switch_assert(channel != NULL); //Answer the channel if it hasn't already been answered - switch_channel_answer(channel); + switch_channel_pre_answer(channel); //Start pestering the user for input for (; (switch_channel_get_state(channel) == CS_EXECUTE) && max_tries > 0; max_tries--) { @@ -1250,7 +1254,7 @@ return SWITCH_STATUS_FALSE; } - switch_channel_answer(channel); + switch_channel_pre_answer(channel); write_frame.data = abuf; write_frame.buflen = sizeof(abuf); @@ -1531,6 +1535,8 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); + switch_channel_pre_answer(channel); + sh = &lsh; codec = &lcodec; timer = &ltimer;

1 0

[commit] r7133 - freeswitch/trunk/src
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 16:14:24 2008 New Revision: 7133 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 7 16:14:24 2008 @@ -568,6 +568,8 @@ ok = 1; } else if (!strcasecmp((char *)hi->name, "group_confirm_file")) { ok = 1; + } else if (!strcasecmp((char *)hi->name, "forked_dial")) { + ok = 1; } else if (!strcasecmp((char *)hi->name, "fail_on_single_reject")) { ok = 1; } else if (!strcasecmp((char *)hi->name, "ignore_early_media")) { @@ -810,8 +812,16 @@ peer_sessions[i] = NULL; new_session = NULL; + + + if (and_argc > 1 || or_argc > 1) { myflags |= SOF_FORKED_DIAL; + } else if (var_event) { + const char *vvar; + if ((vvar = switch_event_get_header(var_event, "forked_dial")) && switch_true(vvar)) { + myflags |= SOF_FORKED_DIAL; + } } if ((reason = switch_core_session_outgoing_channel(session, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! cause: %s\n", switch_channel_cause2str(reason));

1 0

[commit] r7132 - in freeswitch/trunk/src: . include
by Freeswitch SVN 07 Jan '08

07 Jan '08

Author: anthm Date: Mon Jan 7 15:40:59 2008 New Revision: 7132 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Log: fix FSCORE-82 Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Jan 7 15:40:59 2008 @@ -1531,6 +1531,7 @@ SWITCH_DECLARE(void) switch_core_memory_reclaim_events(void); SWITCH_DECLARE(void) switch_core_memory_reclaim_logger(void); SWITCH_DECLARE(void) switch_core_memory_reclaim_all(void); +SWITCH_DECLARE(void) switch_core_setrlimits(void); ///\} Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Jan 7 15:40:59 2008 @@ -430,6 +430,8 @@ set_high_priority(); } + switch_core_setrlimits(); + #ifndef WIN32 if (runas_user || runas_group) { if(change_user_group(runas_user, runas_group) < 0) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 7 15:40:59 2008 @@ -661,6 +661,44 @@ } + +SWITCH_DECLARE(void) switch_core_setrlimits(void) +{ +#ifdef HAVE_SETRLIMIT + struct rlimit rlp; + + /* + Setting the stack size on FreeBSD results in an instant crash. + + If anyone knows how to fix this, + feel free to submit a patch to http://jira.freeswitch.org + */ + +#ifndef __FreeBSD__ + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_THREAD_STACKSIZE; + setrlimit(RLIMIT_STACK, &rlp); +#endif + + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = 999999; + rlp.rlim_max = 999999; + setrlimit(RLIMIT_NOFILE, &rlp); + + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = RLIM_INFINITY; + rlp.rlim_max = RLIM_INFINITY; + + setrlimit(RLIMIT_CPU, &rlp); + setrlimit(RLIMIT_DATA, &rlp); + setrlimit(RLIMIT_FSIZE, &rlp); + setrlimit(RLIMIT_AS, &rlp); +#endif + return; +} + + SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err) { switch_xml_t xml = NULL, cfg = NULL; @@ -702,41 +740,6 @@ switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir); -#ifdef HAVE_SETRLIMIT - { - struct rlimit rlp; - - /* - Setting the stack size on FreeBSD results in an instant crash. - - If anyone knows how to fix this, - feel free to submit a patch to http://jira.freeswitch.org - */ - -#ifndef __FreeBSD__ - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlp.rlim_max = SWITCH_THREAD_STACKSIZE; - setrlimit(RLIMIT_STACK, &rlp); -#endif - - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = 999999; - rlp.rlim_max = 999999; - setrlimit(RLIMIT_NOFILE, &rlp); - - memset(&rlp, 0, sizeof(rlp)); - rlp.rlim_cur = RLIM_INFINITY; - rlp.rlim_max = RLIM_INFINITY; - - setrlimit(RLIMIT_CPU, &rlp); - setrlimit(RLIMIT_DATA, &rlp); - setrlimit(RLIMIT_FSIZE, &rlp); - setrlimit(RLIMIT_AS, &rlp); - } - -#endif - if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate();

1 0