- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13228 - freeswitch/trunk/src
by FreeSWITCH SVN 04 May '09

04 May '09

Author: mrene Date: Mon May 4 15:43:09 2009 New Revision: 13228 Log: Make { } vars take precedence over channel variables Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon May 4 15:43:09 2009 @@ -1082,7 +1082,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]); if ((inner_var_count = switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) { - + switch_event_del_header(var_event, inner_var_array[0]); switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]); } }

1 0

[commit] r13227 - freeswitch/trunk/src/include
by FreeSWITCH SVN 04 May '09

04 May '09

Author: mrene Date: Mon May 4 14:56:46 2009 New Revision: 13227 Log: Update doxygen for switch_channel_variable_first and switch_channel_variable_last Modified: freeswitch/trunk/src/include/switch_channel.h Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon May 4 14:56:46 2009 @@ -247,13 +247,16 @@ SWITCH_DECLARE(switch_status_t) switch_channel_get_variables(switch_channel_t *channel, switch_event_t **event); /*! - * Start iterating over the entries in the channel variable list. - * @param channel the channel to intterate the variales for - * @remark Use switch_hash_next and switch_hash_this with this function to iterate all the channel variables + * \brief Start iterating over the entries in the channel variable list. + * \param channel the channel to iterate the variables for + * \remark This function locks the profile mutex, use switch_channel_variable_last to unlock */ SWITCH_DECLARE(switch_event_header_t *) switch_channel_variable_first(switch_channel_t *channel); - +/*! + * \brief Stop iterating over channel variables. + * \remark Unlocks the profile mutex initially locked in switch_channel_variable_first + */ SWITCH_DECLARE(void) switch_channel_variable_last(switch_channel_t *channel); /*!

1 0

[commit] r13226 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 May '09

04 May '09

Author: anthm Date: Mon May 4 09:36:11 2009 New Revision: 13226 Log: MODENDP-217 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Mon May 4 09:36:11 2009 @@ -819,7 +819,13 @@ switch_url_encode(path_val, path_encoded + 9, path_encoded_len - 9); } else if (is_nat) { char my_contact_str[1024]; - switch_snprintf(my_contact_str, sizeof(my_contact_str), "sip:%s@%s:%d", contact->m_url->url_user, url_ip, network_port); + if (sip->sip_contact->m_url->url_params) { + switch_snprintf(my_contact_str, sizeof(my_contact_str), "sip:%s@%s:%d;%s", + contact->m_url->url_user, url_ip, network_port, sip->sip_contact->m_url->url_params); + } else { + switch_snprintf(my_contact_str, sizeof(my_contact_str), "sip:%s@%s:%d", contact->m_url->url_user, url_ip, network_port); + } + path_encoded_len = (strlen(my_contact_str) * 3) + 1; switch_zmalloc(path_encoded, path_encoded_len);

1 0

[commit] r13225 - freeswitch/trunk/src
by FreeSWITCH SVN 04 May '09

04 May '09

Author: anthm Date: Mon May 4 09:09:32 2009 New Revision: 13225 Log: move originate retry related vars to only be in {} not in channel variable list Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon May 4 09:09:32 2009 @@ -1048,14 +1048,8 @@ ok = 1; } else if (!strcasecmp((char *) hi->name, "instant_ringback")) { ok = 1; - } else if (!strcasecmp((char *) hi->name, "originate_retries")) { - ok = 1; - } else if (!strcasecmp((char *) hi->name, "originate_timeout")) { - ok = 1; } else if (!strcasecmp((char *) hi->name, "progress_timeout")) { ok = 1; - } else if (!strcasecmp((char *) hi->name, "originate_retry_sleep_ms")) { - ok = 1; } if (ok) { @@ -1286,6 +1280,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms); if (caller_channel) { switch_ivr_sleep(oglobals.session, sleep_ms, SWITCH_TRUE, NULL); + if (!switch_channel_ready(caller_channel)) { + status = SWITCH_STATUS_FALSE; + goto done; + } } else { switch_yield(sleep_ms * 1000); }

1 0

[commit] r13224 - freeswitch/trunk/src/mod/formats/mod_shout
by FreeSWITCH SVN 04 May '09

04 May '09

Author: rupa Date: Mon May 4 08:42:52 2009 New Revision: 13224 Log: connection timeout (very) slow connection timeout Timeouts needed to avoid deadlock between read thread and file close. If read thread never returns -- the file can never be closed. Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Mon May 4 08:42:52 2009 @@ -97,6 +97,7 @@ struct shout_context { shout_t *shout; + char curl_error_buff[CURL_ERROR_SIZE]; lame_global_flags *gfp; char *stream_url; switch_mutex_t *audio_mutex; @@ -512,6 +513,7 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj) { CURL *curl_handle = NULL; + CURLcode cc; shout_context_t *context = (shout_context_t *) obj; switch_thread_rwlock_rdlock(context->rwlock); @@ -523,7 +525,15 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, stream_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) context); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "FreeSWITCH(mod_shout)/1.0"); - curl_easy_perform(curl_handle); + curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, 30); /* eventually timeout connect */ + curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_LIMIT, 100); /* handle trickle connections */ + curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_TIME, 30); + curl_easy_setopt(curl_handle, CURLOPT_ERRORBUFFER, context->curl_error_buff); + cc = curl_easy_perform(curl_handle); + if (cc && cc != CURLE_WRITE_ERROR) { /* write error is ok, we just exited from callback early */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "CURL returned error:[%d] %s : %s [%s]\n", cc, curl_easy_strerror(cc), context->curl_error_buff, context->stream_url); + } curl_easy_cleanup(curl_handle); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read Thread Done\n");

1 0

[commit] r13223 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 May '09

03 May '09

Author: brian Date: Sun May 3 10:33:48 2009 New Revision: 13223 Log: remove accidental commit Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Sun May 3 10:33:48 2009 @@ -1248,7 +1248,6 @@ } else { switch_set_string(ref_to, msg->string_arg); } - switch_yield(10); nua_refer(tech_pvt->nh, SIPTAG_REFER_TO_STR(ref_to), SIPTAG_REFERRED_BY_STR(tech_pvt->contact_url), TAG_END()); switch_mutex_unlock(tech_pvt->sofia_mutex); sofia_wait_for_reply(tech_pvt, 9999, 300);

1 0

[commit] r13222 - in freeswitch/trunk/src/mod: endpoints/mod_sofia formats/mod_local_stream
by FreeSWITCH SVN 03 May '09

03 May '09

Author: anthm Date: Sat May 2 22:15:42 2009 New Revision: 13222 Log: refactor resampling in mod_local_stream Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c 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 Sat May 2 22:15:42 2009 @@ -1248,11 +1248,11 @@ } else { switch_set_string(ref_to, msg->string_arg); } + switch_yield(10); nua_refer(tech_pvt->nh, SIPTAG_REFER_TO_STR(ref_to), SIPTAG_REFERRED_BY_STR(tech_pvt->contact_url), TAG_END()); switch_mutex_unlock(tech_pvt->sofia_mutex); sofia_wait_for_reply(tech_pvt, 9999, 300); switch_mutex_lock(tech_pvt->sofia_mutex); - if ((var = switch_channel_get_variable(tech_pvt->channel, "sip_refer_reply"))) { msg->string_reply = switch_core_session_strdup(session, var); } else { 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 Sat May 2 22:15:42 2009 @@ -184,7 +184,7 @@ fname = path_buf; fh.prebuf = source->prebuf; fh.pre_buffer_datalen = source->prebuf; - + if (switch_core_file_open(&fh, (char *) fname, source->channels, source->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) { @@ -192,10 +192,7 @@ switch_yield(1000000); continue; } - - source->rate = fh.samplerate; - source->samples = switch_samples_per_packet(fh.native_rate, source->interval); - + if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); switch_dir_close(source->dir_handle);

1 0

[commit] r13221 - freeswitch/trunk/scripts/contrib/trixter/skypiax
by FreeSWITCH SVN 02 May '09

02 May '09

Author: trixter Date: Fri May 1 20:18:57 2009 New Revision: 13221 Log: patches to skypiax to remove some duplicate code, *minor* performance tweaks Added: freeswitch/trunk/scripts/contrib/trixter/skypiax/ freeswitch/trunk/scripts/contrib/trixter/skypiax/README freeswitch/trunk/scripts/contrib/trixter/skypiax/mod_skypiax.c.r13219.svndiff Added: freeswitch/trunk/scripts/contrib/trixter/skypiax/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/skypiax/README Fri May 1 20:18:57 2009 @@ -0,0 +1,2 @@ +I am putting my patches and such in here so that people cna use them and test them, I did not feel like maintaining my own skypiax at this point, I will see how the patching parts go and if there are any conflicts between my ideas for this and other peoples ideas. + Added: freeswitch/trunk/scripts/contrib/trixter/skypiax/mod_skypiax.c.r13219.svndiff ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/skypiax/mod_skypiax.c.r13219.svndiff Fri May 1 20:18:57 2009 @@ -0,0 +1,144 @@ +Index: src/mod/endpoints/mod_skypiax/mod_skypiax.c +=================================================================== +--- src/mod/endpoints/mod_skypiax/mod_skypiax.c (revision 13219) ++++ src/mod/endpoints/mod_skypiax/mod_skypiax.c (working copy) +@@ -27,9 +27,9 @@ + * + * + * Further Contributors: ++ * Bret McDanel <trixter AT 0xdecafbad.com> + * + * +- * + * mod_skypiax.c -- Skype compatible Endpoint Module + * + */ +@@ -338,13 +338,9 @@ + switch_frame_t ** frame, switch_io_flag_t flags, + int stream_id) + { +- switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + switch_byte_t *data; + +- channel = switch_core_session_get_channel(session); +- switch_assert(channel != NULL); +- + tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + tech_pvt->read_frame.flags = SFF_NONE; +@@ -408,13 +404,9 @@ + switch_frame_t * frame, switch_io_flag_t flags, + int stream_id) + { +- switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + unsigned int sent; + +- channel = switch_core_session_get_channel(session); +- switch_assert(channel != NULL); +- + tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + +@@ -444,11 +436,7 @@ + static switch_status_t channel_answer_channel(switch_core_session_t * session) + { + private_t *tech_pvt; +- switch_channel_t *channel = NULL; + +- channel = switch_core_session_get_channel(session); +- switch_assert(channel != NULL); +- + tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + +@@ -460,12 +448,8 @@ + static switch_status_t channel_receive_message(switch_core_session_t * session, + switch_core_session_message_t * msg) + { +- switch_channel_t *channel; + private_t *tech_pvt; + +- channel = switch_core_session_get_channel(session); +- switch_assert(channel != NULL); +- + tech_pvt = (private_t *) switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + +@@ -655,14 +639,11 @@ + { + private_t *tech_pvt = obj; + int res; +- int forever = 1; + + DEBUGA_SKYPE("In skypiax_signaling_thread_func: started, p=%p\n", SKYPIAX_P_LOG, + (void *) tech_pvt); + +- while (forever) { +- if (!running) +- break; ++ while (running) { + res = skypiax_signaling_read(tech_pvt); + if (res == CALLFLOW_INCOMING_HANGUP) { + switch_core_session_t *session = NULL; +@@ -912,7 +893,6 @@ + switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].dialplan, dialplan); + switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].destination, + destination); +- switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].context, context); + + DEBUGA_SKYPE + ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].X11_display=%s\n", +@@ -944,9 +924,6 @@ + ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].destination=%s\n", + SKYPIAX_P_LOG, interface_id, + globals.SKYPIAX_INTERFACES[interface_id].destination); +- DEBUGA_SKYPE +- ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].context=%s\n", +- SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].context); + WARNINGA("STARTING interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + + switch_threadattr_create(&skypiax_api_thread_attr, skypiax_module_pool); +@@ -1036,8 +1013,6 @@ + i, i, globals.SKYPIAX_INTERFACES[i].dialplan); + DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].destination=%s\n", + SKYPIAX_P_LOG, i, i, globals.SKYPIAX_INTERFACES[i].destination); +- DEBUGA_SKYPE("i=%d globals.SKYPIAX_INTERFACES[%d].context=%s\n", SKYPIAX_P_LOG, i, +- i, globals.SKYPIAX_INTERFACES[i].context); + } + } + } +@@ -1348,10 +1323,9 @@ + private_t *find_available_skypiax_interface(void) + { + private_t *tech_pvt = NULL; +- int found = 0; + int i; + +- for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { ++ for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) { + if (strlen(globals.SKYPIAX_INTERFACES[i].name)) { + int skype_state = 0; + +@@ -1359,17 +1333,13 @@ + skype_state = tech_pvt->interface_state; + DEBUGA_SKYPE("skype interface: %d, name: %s, state: %d\n", SKYPIAX_P_LOG, i, + globals.SKYPIAX_INTERFACES[i].name, skype_state); +- if (SKYPIAX_STATE_DOWN == skype_state || 0 == skype_state) { +- found = 1; +- break; ++ if (SKYPIAX_STATE_DOWN == skype_state || 0 == skype_state) { ++ return tech_pvt; + } + } + } + +- if (found) +- return tech_pvt; +- else +- return NULL; ++ return NULL; + } + + SWITCH_STANDARD_API(sk_function)

1 0

[commit] r13220 - in freeswitch/trunk/src/mod: endpoints/mod_sofia event_handlers/mod_event_socket
by FreeSWITCH SVN 02 May '09

02 May '09

Author: anthm Date: Fri May 1 19:58:51 2009 New Revision: 13220 Log: tweak log messages Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.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 Fri May 1 19:58:51 2009 @@ -1880,7 +1880,7 @@ } if (!switch_strlen_zero(profile_name) && (profile = sofia_glue_find_profile(profile_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile [%s] Already exists.\n", switch_str_nil(profile_name)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Profile [%s] Already exists.\n", switch_str_nil(profile_name)); status = SWITCH_STATUS_FALSE; sofia_glue_release_profile(profile); return status; 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 Fri May 1 19:58:51 2009 @@ -93,6 +93,7 @@ static struct { switch_mutex_t *listener_mutex; switch_event_node_t *node; + int debug; } globals; static struct { @@ -235,7 +236,9 @@ } if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && switch_epoch_time_now(NULL) - l->last_flush > l->timeout) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id); + if (globals.debug > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id); + } remove_listener(l); expire_listener(&l); continue; @@ -814,8 +817,11 @@ stream->write_function(stream, " <reply type=\"success\">Listener %u Created</reply>\n", listener->id); xmlize_listener(listener, stream); stream->write_function(stream, "</data>\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating event-sink listener [%u]\n", listener->id); + if (globals.debug > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating event-sink listener [%u]\n", listener->id); + } + goto end; } else if (!strcasecmp(wcmd, "destroy-listener")) { char *id = switch_event_get_header(stream->param_event, "listen-id"); @@ -826,7 +832,9 @@ } if ((listener = find_listener(idl))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying event-sink listener [%u]\n", idl); + if (globals.debug > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying event-sink listener [%u]\n", idl); + } remove_listener(listener); stream->write_function(stream, "<data>\n <reply type=\"success\">listener %u destroyed</reply>\n", listener->id); xmlize_listener(listener, stream); @@ -834,7 +842,9 @@ expire_listener(&listener); goto end; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Request to destroy unknown event-sink listener [%u]\n", idl); + if (globals.debug > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Request to destroy unknown event-sink listener [%u]\n", idl); + } stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n"); goto end; } @@ -2003,10 +2013,12 @@ } } - if (switch_strlen_zero(listener->remote_ip)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open\n"); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open from %s:%d\n", listener->remote_ip, listener->remote_port); + if (globals.debug > 0) { + if (switch_strlen_zero(listener->remote_ip)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open from %s:%d\n", listener->remote_ip, listener->remote_port); + } } switch_socket_opt_set(listener->sock, SWITCH_SO_NONBLOCK, TRUE); @@ -2106,7 +2118,9 @@ remove_listener(listener); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n"); + if (globals.debug > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n"); + } switch_thread_rwlock_wrlock(listener->rwlock); flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE); @@ -2145,7 +2159,10 @@ switch_thread_rwlock_unlock(listener->rwlock); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n"); + if (globals.debug > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n"); + } + switch_core_hash_destroy(&listener->event_hash); if (listener->session) { @@ -2194,6 +2211,8 @@ if (!strcmp(var, "listen-ip")) { set_pref_ip(val); + } else if (!strcmp(var, "debug")) { + globals.debug = atoi(val); } else if (!strcmp(var, "listen-port")) { prefs.port = (uint16_t) atoi(val); } else if (!strcmp(var, "password")) {

1 0

[commit] r13219 - freeswitch/trunk/src
by FreeSWITCH SVN 01 May '09

01 May '09

Author: anthm Date: Fri May 1 16:31:16 2009 New Revision: 13219 Log: prevent buffer destroy race Modified: freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri May 1 16:31:16 2009 @@ -915,6 +915,9 @@ } else { switch_size_t x; for (x = 0; x < frames; x++) { + if (switch_channel_down(session->channel) || !session->raw_write_buffer) { + goto error; + } if ((session->raw_write_frame.datalen = (uint32_t) switch_buffer_read(session->raw_write_buffer, session->raw_write_frame.data, bytes)) != 0) { int rate; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri May 1 16:31:16 2009 @@ -879,9 +879,15 @@ switch_mutex_unlock(session->resample_mutex); /* clear indications */ switch_core_session_flush_message(session); + /* wipe these, they will be recreated if need be */ - switch_buffer_destroy(&session->raw_read_buffer); + switch_mutex_lock(session->codec_write_mutex); switch_buffer_destroy(&session->raw_write_buffer); + switch_mutex_unlock(session->codec_write_mutex); + + switch_mutex_lock(session->codec_read_mutex); + switch_buffer_destroy(&session->raw_read_buffer); + switch_mutex_unlock(session->codec_read_mutex); if (flush_dtmf) { while ((has = switch_channel_has_dtmf(channel))) {

1 0