April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13133 - freeswitch/trunk/libs/iksemel/src
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: anthm Date: Thu Apr 23 09:47:07 2009 New Revision: 13133 Log: grr Modified: freeswitch/trunk/libs/iksemel/src/stream.c Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Thu Apr 23 09:47:07 2009 @@ -512,11 +512,11 @@ #ifdef HAVE_GNUTLS if (data->flags & SF_SECURE) { len = gnutls_record_recv (data->sess, data->buf, NET_IO_BUF_SIZE - 1); + if (len == 0) len = -1; } else #endif { len = data->trans->recv (data->sock, data->buf, NET_IO_BUF_SIZE - 1, timeout); - if (len == 0) len = -1; } if (len < 0) return IKS_NET_RWERR; if (len == 0) break;

1 0

[commit] r13132 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: buklov Date: Thu Apr 23 08:44:10 2009 New Revision: 13132 Log: add 1xx.wav Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Thu Apr 23 08:44:10 2009 @@ -72,6 +72,7 @@ <prompt phrase="Одна" filename="1f.wav"/> <prompt phrase="Одно" filename="1n.wav"/> <prompt phrase="Одного" filename="1x.wav"/> + <prompt phrase="Одной" filename="1xx.wav"/> <prompt phrase="Первого" filename="h-1x.wav"/> <prompt phrase="Первый" filename="h-1m.wav"/> <prompt phrase="Первое" filename="h-1n.wav"/>

1 0

[commit] r13131 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: anthm Date: Thu Apr 23 08:15:03 2009 New Revision: 13131 Log: only pass 2833 while bridged and while bridged to another channel that uses our RTP stack Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Apr 23 08:15:03 2009 @@ -301,6 +301,8 @@ */ SWITCH_DECLARE(switch_bool_t) switch_channel_clear_flag_partner(switch_channel_t *channel, switch_channel_flag_t flag); +SWITCH_DECLARE(uint32_t) switch_channel_test_flag_partner(switch_channel_t *channel, switch_channel_flag_t flag); + /*! \brief Set given flag(s) on a given channel to be applied on the next state change \param channel channel on which to set flag(s) Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Apr 23 08:15:03 2009 @@ -883,6 +883,7 @@ CF_PAUSE_BUGS, CF_DIVERT_EVENTS, CF_BLOCK_STATE, + CF_FS_RTP, /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ CF_FLAG_MAX } switch_channel_flag_t; 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 Thu Apr 23 08:15:03 2009 @@ -1024,11 +1024,20 @@ case SWITCH_MESSAGE_INDICATE_BRIDGE: if (switch_rtp_ready(tech_pvt->rtp_session)) { + if (sofia_test_flag(tech_pvt, TFLAG_PASS_RFC2833) && switch_channel_test_flag_partner(channel, CF_FS_RTP)) { + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s activate passthru 2833 mode.\n", switch_channel_get_name(channel)); + } + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); } goto end; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: if (switch_rtp_ready(tech_pvt->rtp_session)) { + if (switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s deactivate passthru 2833 mode.\n", switch_channel_get_name(channel)); + switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833); + } rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK); } goto end; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Apr 23 08:15:03 2009 @@ -233,6 +233,7 @@ TFLAG_PROXY_MEDIA, TFLAG_HOLD_LOCK, TFLAG_3PCC_HAS_ACK, + TFLAG_PASS_RFC2833, /* No new flags below this line */ TFLAG_MAX 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 Thu Apr 23 08:15:03 2009 @@ -2106,7 +2106,7 @@ if (sofia_test_pflag(tech_pvt->profile, PFLAG_PASS_RFC2833) || ((val = switch_channel_get_variable(tech_pvt->channel, "pass_rfc2833")) && switch_true(val))) { - flags |= SWITCH_RTP_FLAG_PASS_RFC2833; + sofia_set_flag(tech_pvt, TFLAG_PASS_RFC2833); } @@ -2219,6 +2219,8 @@ uint8_t vad_out = sofia_test_flag(tech_pvt, TFLAG_VAD_OUT) ? 1 : 0; uint8_t inb = sofia_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; uint32_t stun_ping = 0; + + switch_channel_set_flag(tech_pvt->channel, CF_FS_RTP); if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_enable_vad_in")) && switch_true(val)) { vad_in = 1; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Apr 23 08:15:03 2009 @@ -719,6 +719,24 @@ return SWITCH_FALSE; } +SWITCH_DECLARE(uint32_t) switch_channel_test_flag_partner(switch_channel_t *channel, switch_channel_flag_t flag) +{ + const char *uuid; + int r = 0; + + switch_assert(channel != NULL); + + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + switch_core_session_t *session; + if ((session = switch_core_session_locate(uuid))) { + r = switch_channel_test_flag(switch_core_session_get_channel(session), flag); + switch_core_session_rwunlock(session); + } + } + + return r; +} + SWITCH_DECLARE(switch_bool_t) switch_channel_clear_flag_partner(switch_channel_t *channel, switch_channel_flag_t flag) { const char *uuid;

1 0

[commit] r13130 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: mrene Date: Thu Apr 23 00:26:21 2009 New Revision: 13130 Log: Fix missing UNPROTECT_INTERFACE in case pre_answer fails Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Apr 23 00:26:21 2009 @@ -1296,7 +1296,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application(switch_core_session_t *session, const char *app, const char *arg) { switch_application_interface_t *application_interface; - + switch_status_t status = SWITCH_STATUS_SUCCESS; + if (switch_channel_down(session->channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is hungup, aborting execution of application: %s\n", app); return SWITCH_STATUS_FALSE; @@ -1311,8 +1312,7 @@ if (!application_interface->application_function) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Function for %s\n", app); switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - UNPROTECT_INTERFACE(application_interface); - return SWITCH_STATUS_FALSE; + switch_goto_status(SWITCH_STATUS_FALSE, done); } if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) && !switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA)) { @@ -1324,15 +1324,16 @@ app, switch_channel_get_name(session->channel)); if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n"); - return SWITCH_STATUS_FALSE; + switch_goto_status(SWITCH_STATUS_FALSE, done); } } switch_core_session_exec(session, application_interface, arg); +done: UNPROTECT_INTERFACE(application_interface); - return SWITCH_STATUS_SUCCESS; + return status; } SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *session,

1 0

[commit] r13129 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: mrene Date: Thu Apr 23 00:00:47 2009 New Revision: 13129 Log: move rwunlock where it makes sense Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.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 Thu Apr 23 00:00:47 2009 @@ -2838,8 +2838,8 @@ } sofia_glue_toggle_hold(tech_pvt, 1); - switch_core_session_rwunlock(other_session); } + switch_core_session_rwunlock(other_session); } switch_core_session_rwunlock(session);

1 0

[commit] r13128 - freeswitch/trunk/support-d
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: anthm Date: Wed Apr 22 23:04:36 2009 New Revision: 13128 Log: add cool hise show to .emacs Modified: freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Wed Apr 22 23:04:36 2009 @@ -27,6 +27,15 @@ +(add-hook 'c-mode-common-hook + (lambda() + (local-set-key (kbd "C-c <right>") 'hs-show-block) + (local-set-key (kbd "C-c <left>") 'hs-hide-block) + (local-set-key (kbd "C-c <up>") 'hs-hide-all) + (local-set-key (kbd "C-c <down>") 'hs-show-all) + (hs-minor-mode t))) + + ;; replace C-s with C-\ in a much more general way so that C-\ can be typed ;; for every instance of C-s. It is at such a low level that emacs even thinks ;; that you typed a C-s. replace C-s with C-\ , globally

1 0

[commit] r13127 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 23 Apr '09

23 Apr '09

Author: anthm Date: Wed Apr 22 19:30:43 2009 New Revision: 13127 Log: change len to seconds Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Apr 22 19:30:43 2009 @@ -1064,7 +1064,7 @@ SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) { if (switch_core_file_seek(&fh, &pos, 0, SEEK_END) == SWITCH_STATUS_SUCCESS) { - *message_len = pos; + *message_len = pos / fh.samplerate; status = SWITCH_STATUS_SUCCESS; } switch_core_file_close(&fh);

1 0

[commit] r13126 - freeswitch/trunk/src/mod/loggers/mod_console
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 18:42:11 2009 New Revision: 13126 Log: Fix mod_console too (missing FD_ZERO before FD_SET) Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Wed Apr 22 18:42:11 2009 @@ -155,6 +155,7 @@ fd = fileno(handle); memset(&to, 0, sizeof(to)); + FD_ZERO(&can_write); FD_SET(fd, &can_write); to.tv_sec = sec; to.tv_usec = usec;

1 0

[commit] r13125 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: stkn Date: Wed Apr 22 18:34:48 2009 New Revision: 13125 Log: Do not use struct fd_set uninitialized (always FD_ZERO() them, before using FD_SET() on a new one, or reusing them after select()). Fixes a segfault on solaris Modified: freeswitch/trunk/src/switch_log.c Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Wed Apr 22 18:34:48 2009 @@ -332,6 +332,7 @@ fd = fileno(handle); memset(&to, 0, sizeof(to)); + FD_ZERO(&can_write); FD_SET(fd, &can_write); to.tv_sec = 0; to.tv_usec = 100000;

1 0

[commit] r13124 - freeswitch/trunk/libs/iksemel/src
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 17:19:12 2009 New Revision: 13124 Log: doh Modified: freeswitch/trunk/libs/iksemel/src/stream.c Modified: freeswitch/trunk/libs/iksemel/src/stream.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/stream.c (original) +++ freeswitch/trunk/libs/iksemel/src/stream.c Wed Apr 22 17:19:12 2009 @@ -516,9 +516,10 @@ #endif { len = data->trans->recv (data->sock, data->buf, NET_IO_BUF_SIZE - 1, timeout); + if (len == 0) len = -1; } - if (len <= 0) return IKS_NET_RWERR; - + if (len < 0) return IKS_NET_RWERR; + if (len == 0) break; data->buf[len] = '\0'; if (data->logHook) data->logHook (data->user_data, data->buf, len, 1); ret = iks_parse (prs, data->buf, len, 0);

1 0