March 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7850 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Mar '08

10 Mar '08

Author: anthm Date: Mon Mar 10 12:13:12 2008 New Revision: 7850 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 Mon Mar 10 12:13:12 2008 @@ -223,13 +223,6 @@ switch_call_cause_t cause = switch_channel_get_cause(channel); int sip_cause = hangup_cause_to_sip(cause); - if (tech_pvt->profile->rtpip) { - if (tech_pvt->local_sdp_audio_port) { - switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); - } else if (tech_pvt->local_sdp_video_port) { - switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); - } - } if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { const char *buuid; 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 Mon Mar 10 12:13:12 2008 @@ -223,7 +223,9 @@ } if (switch_test_flag(tech_pvt, TFLAG_VIDEO)) { - sofia_glue_tech_choose_video_port(tech_pvt); + if (!tech_pvt->local_sdp_video_port) { + sofia_glue_tech_choose_video_port(tech_pvt); + } if ((v_port = tech_pvt->adv_sdp_video_port)) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=video %d RTP/AVP", v_port); @@ -523,7 +525,7 @@ char *ip = tech_pvt->profile->rtpip; switch_port_t sdp_port; char tmp[50]; - + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->adv_sdp_video_port) { return SWITCH_STATUS_SUCCESS; } @@ -1174,10 +1176,14 @@ if (tech_pvt->rtp_session) { switch_rtp_destroy(&tech_pvt->rtp_session); + } else if (tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } if (tech_pvt->video_rtp_session) { switch_rtp_destroy(&tech_pvt->video_rtp_session); + } else if (tech_pvt->local_sdp_video_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); } }

1 0

[commit] r7849 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 09 Mar '08

09 Mar '08

Author: brian Date: Sun Mar 9 18:28:28 2008 New Revision: 7849 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: tweak Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Sun Mar 9 18:28:28 2008 @@ -178,7 +178,7 @@ <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> <prompt phrase="goodbye" filename="vm-goodbye.wav"/> <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> - <prompt phrase="choose a greeting between 1 and 3" filename="vm-choose_greeting.wav"/> + <prompt phrase="choose a greeting between 1 and 9" filename="vm-choose_greeting_choose.wav"/> <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/>

1 0

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

08 Mar '08

Author: anthm Date: Sat Mar 8 16:37:17 2008 New Revision: 7848 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 Mar 8 16:37:17 2008 @@ -223,8 +223,12 @@ switch_call_cause_t cause = switch_channel_get_cause(channel); int sip_cause = hangup_cause_to_sip(cause); - if (tech_pvt->profile->rtpip && tech_pvt->local_sdp_audio_port) { - switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); + if (tech_pvt->profile->rtpip) { + if (tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); + } else if (tech_pvt->local_sdp_video_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); + } } if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { 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 Sat Mar 8 16:37:17 2008 @@ -488,8 +488,9 @@ return SWITCH_STATUS_SUCCESS; } } - if (tech_pvt->adv_sdp_audio_port) { - switch_rtp_release_port(tech_pvt->adv_sdp_audio_ip, tech_pvt->adv_sdp_audio_port); + + if (tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } @@ -527,6 +528,10 @@ return SWITCH_STATUS_SUCCESS; } + if (tech_pvt->local_sdp_video_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); + } + if (!(tech_pvt->local_sdp_video_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP ports available!\n"); return SWITCH_STATUS_FALSE; @@ -1634,11 +1639,11 @@ sofia_glue_check_video_codecs(tech_pvt); - if (!tech_pvt->local_sdp_video_port) { - sofia_glue_tech_choose_video_port(tech_pvt); - } - if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { + if (!tech_pvt->local_sdp_video_port) { + sofia_glue_tech_choose_video_port(tech_pvt); + } + flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE); sofia_glue_tech_set_video_codec(tech_pvt, 0);

1 0

[commit] r7847 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Sat Mar 8 16:15:02 2008 New Revision: 7847 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: silly rabbit, leaks are for kids. Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sat Mar 8 16:15:02 2008 @@ -176,6 +176,7 @@ curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); curl_easy_cleanup(curl_handle); curl_slist_free_all(headers); + curl_slist_free_all(slist); close(config_data.fd); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n");

1 0

[commit] r7846 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Sat Mar 8 16:08:00 2008 New Revision: 7846 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: silly rabbit, leaks are for kids. Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Sat Mar 8 16:08:00 2008 @@ -73,6 +73,8 @@ uint32_t cur_try; long httpRes; CURL *curl_handle = NULL; + struct curl_slist *headers = NULL; + struct curl_slist *slist = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; @@ -121,8 +123,6 @@ /* try to post it to the web server */ if (!switch_strlen_zero(globals.url)) { - struct curl_slist *headers = NULL; - struct curl_slist *slist = NULL; curl_handle = curl_easy_init(); if (globals.encode) { @@ -189,6 +189,9 @@ } curl_easy_cleanup(curl_handle); curl_slist_free_all(headers); + curl_slist_free_all(slist); + slist = NULL; + headers = NULL; curl_handle = NULL; /* if we are here the web post failed for some reason */ @@ -222,6 +225,12 @@ if (curl_handle) { curl_easy_cleanup(curl_handle); } + if (headers) { + curl_slist_free_all(headers); + } + if (slist) { + curl_slist_free_all(slist); + } switch_safe_free(curl_xml_text); switch_safe_free(xml_text); switch_safe_free(path);

1 0

[commit] r7845 - in freeswitch/trunk/src: . include
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: anthm Date: Sat Mar 8 16:07:15 2008 New Revision: 7845 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_state_machine.c Log: fix super sonic race at 400 cps conditions Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sat Mar 8 16:07:15 2008 @@ -80,9 +80,9 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, const char *file, const char *func, int line, switch_channel_state_t state); -SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, +SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, switch_channel_state_t state, const char *file, const char *func, int line); -#define switch_channel_set_running_state(channel) switch_channel_perform_set_running_state(channel, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_channel_set_running_state(channel, state) switch_channel_perform_set_running_state(channel, state, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief Set the current state of a channel Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Mar 8 16:07:15 2008 @@ -763,13 +763,13 @@ return CS_DONE; } -SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, +SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, switch_channel_state_t state, const char *file, const char *func, int line) { switch_mutex_lock(channel->flag_mutex); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "%s Running State Change %s\n", - channel->name, state_names[channel->state]); - channel->running_state = channel->state; + channel->name, state_names[state]); + channel->running_state = state; if (channel->state_flags) { channel->flags |= channel->state_flags; @@ -778,18 +778,18 @@ if (channel->state >= CS_RING) { switch_clear_flag(channel, CF_TRANSFER); - switch_channel_presence(channel, "unknown", (char *) state_names[channel->state]); + switch_channel_presence(channel, "unknown", (char *) state_names[state]); } - if (channel->state < CS_HANGUP) { + if (state < CS_HANGUP) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_STATE) == SWITCH_STATUS_SUCCESS) { - if (channel->state == CS_RING) { + if (state == CS_RING) { switch_channel_event_set_data(channel, event); } else { char state_num[25]; - switch_snprintf(state_num, sizeof(state_num), "%d", channel->state); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", (char *) switch_channel_state_name(channel->state)); + switch_snprintf(state_num, sizeof(state_num), "%d", state); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", (char *) switch_channel_state_name(state)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%s", (char *) state_num); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", "%s", channel->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session)); @@ -1013,12 +1013,9 @@ } else { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_WARNING, "%s Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); - /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */ - if (channel->state < CS_HANGUP) { - /* not cool lets crash this bad boy and figure out wtf is going on */ - switch_assert(0); - } + /* not cool lets crash this bad boy and figure out wtf is going on */ + switch_assert(channel->state >= CS_HANGUP); } done: Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Sat Mar 8 16:07:15 2008 @@ -398,7 +398,7 @@ int proceed = 1; int do_extra_handlers = 1; - switch_channel_set_running_state(session->channel); + switch_channel_set_running_state(session->channel, state); switch (state) { case CS_NEW: /* Just created, Waiting for first instructions */

1 0

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

08 Mar '08

Author: mikej Date: Fri Mar 7 23:26:02 2008 New Revision: 7844 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Bitwise operation on logical result: ! has higher precedence than &. Use && or (!(x & y)) instead 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 Mar 7 23:26:02 2008 @@ -1986,7 +1986,7 @@ char *full_ref_by = NULL; char *full_ref_to = NULL; - if (!profile->mflags & MFLAG_REFER) { + if (!(profile->mflags & MFLAG_REFER)) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto done; } 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 Fri Mar 7 23:26:02 2008 @@ -638,7 +638,7 @@ char key[128] = ""; switch_event_t *v_event = NULL; - if (!profile->mflags & MFLAG_REGISTER) { + if (!(profile->mflags & MFLAG_REGISTER)) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; }

1 0

[commit] r7843 - freeswitch/trunk/src
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 23:18:23 2008 New Revision: 7843 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: type tweak 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 Fri Mar 7 23:18:23 2008 @@ -1108,7 +1108,7 @@ switch_input_args_t args = { 0 }; switch_status_t status = SWITCH_STATUS_SUCCESS; char terminator; - int len; + size_t len; switch_assert(session);

1 0

[commit] r7842 - freeswitch/trunk/src
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 23:16:22 2008 New Revision: 7842 Modified: freeswitch/trunk/src/switch_console.c Log: ifdef for windows build Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Fri Mar 7 23:16:22 2008 @@ -35,6 +35,7 @@ #include <switch_version.h> #define CMD_BUFLEN 1024; +#ifdef SWITCH_HAVE_LIBEDIT /* * store a strdup() of the string configured in XML * bound to each of the 12 function key @@ -82,7 +83,7 @@ return SWITCH_STATUS_SUCCESS; } - +#endif SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) {

1 0

[commit] r7841 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: anthm Date: Fri Mar 7 21:11:21 2008 New Revision: 7841 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_rtp.c Log: update 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 Mar 7 21:11:21 2008 @@ -1920,6 +1920,11 @@ break; case nua_callstate_terminating: + if (session) { + if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + } + } break; case nua_callstate_terminated: if (session) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Mar 7 21:11:21 2008 @@ -411,8 +411,8 @@ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); - switch_queue_create(&EVENT_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, THRUNTIME_POOL); - switch_queue_create(&EVENT_HEADER_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, THRUNTIME_POOL); + switch_queue_create(&EVENT_RECYCLE_QUEUE, 250000, THRUNTIME_POOL); + switch_queue_create(&EVENT_HEADER_RECYCLE_QUEUE, 250000, THRUNTIME_POOL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Eventing Engine.\n"); switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 7 21:11:21 2008 @@ -765,12 +765,17 @@ if (switch_rtp_create(&rtp_session, payload, samples_per_interval, ms_per_packet, flags, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { goto end; } - + + switch_mutex_lock(rtp_session->flag_mutex); + if (switch_rtp_set_local_address(rtp_session, rx_host, rx_port, err) != SWITCH_STATUS_SUCCESS) { + switch_mutex_unlock(rtp_session->flag_mutex); rtp_session = NULL; + goto end; } if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, err) != SWITCH_STATUS_SUCCESS) { + switch_mutex_unlock(rtp_session->flag_mutex); rtp_session = NULL; goto end; } @@ -778,6 +783,7 @@ end: if (rtp_session) { + switch_mutex_unlock(rtp_session->flag_mutex); rtp_session->ready = 2; rtp_session->rx_host = switch_core_strdup(rtp_session->pool, rx_host); rtp_session->rx_port = rx_port;

1 0