April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13163 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mrene Date: Mon Apr 27 10:51:19 2009 New Revision: 13163 Log: FSCORE-356 Modified: freeswitch/trunk/src/switch_core_state_machine.c 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 Mon Apr 27 10:51:19 2009 @@ -432,6 +432,7 @@ const char *hook_var; switch_core_session_t *use_session = NULL; switch_call_cause_t cause = switch_channel_get_cause(session->channel); + switch_call_cause_t cause_q850 = switch_channel_get_cause_q850(session->channel); switch_event_t *event; switch_channel_set_hangup_time(session->channel); @@ -441,6 +442,7 @@ switch_channel_stop_broadcast(session->channel); switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause)); + switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850); switch_channel_presence(session->channel, "unavailable", switch_channel_cause2str(cause), NULL); switch_channel_set_timestamps(session->channel);

1 0

[commit] r13162 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 09:15:55 2009 New Revision: 13162 Log: add loopback_bowout variable (set to false to skip auto-bowout) Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Apr 27 09:15:55 2009 @@ -640,21 +640,27 @@ ) { const char *a_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE); const char *b_uuid = switch_channel_get_variable(tech_pvt->other_channel, SWITCH_SIGNAL_BOND_VARIABLE); - + const char *vetoa, *vetob; + switch_set_flag_locked(tech_pvt, TFLAG_BOWOUT); switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_BOWOUT); + + vetoa = switch_channel_get_variable(tech_pvt->channel, "loopback_bowout"); + vetob = switch_channel_get_variable(tech_pvt->other_tech_pvt->channel, "loopback_bowout"); + + if ((!vetoa || switch_true(vetoa)) && (!vetob || switch_true(vetob))) { + switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); + switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + + if (a_uuid && b_uuid) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel)); - switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); - switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); - - if (a_uuid && b_uuid) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel)); - - /* channel_masquerade eat your heart out....... */ - switch_ivr_uuid_bridge(a_uuid, b_uuid); - switch_mutex_unlock(tech_pvt->mutex); - return SWITCH_STATUS_SUCCESS; + /* channel_masquerade eat your heart out....... */ + switch_ivr_uuid_bridge(a_uuid, b_uuid); + switch_mutex_unlock(tech_pvt->mutex); + return SWITCH_STATUS_SUCCESS; + } } } @@ -675,9 +681,10 @@ if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { switch_frame_free(&clone); } + + switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); } - switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); status = SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13161 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 09:14:42 2009 New Revision: 13161 Log: auto-sync idle timers Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Apr 27 09:14:42 2009 @@ -324,7 +324,12 @@ #else int cond_index = 1; #endif + int delta = (int)(private_info->reference - TIMER_MATRIX[timer->interval].tick); + /* sync up timer if it's not been called for a while otherwise it will return instantly several times until it catches up */ + if (delta < 0) { + private_info->reference = timer->tick = TIMER_MATRIX[timer->interval].tick; + } timer_step(timer); while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) {

1 0

[commit] r13160 - freeswitch/trunk/support-d
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mrene Date: Mon Apr 27 08:14:51 2009 New Revision: 13160 Log: Add make to apt prereqs Modified: freeswitch/trunk/support-d/prereq.sh Modified: freeswitch/trunk/support-d/prereq.sh ============================================================================== --- freeswitch/trunk/support-d/prereq.sh (original) +++ freeswitch/trunk/support-d/prereq.sh Mon Apr 27 08:14:51 2009 @@ -2,7 +2,7 @@ NEEDED_PACKAGES_YUM='automake autoconf libtool screen gdb gcc-c++ compat-gcc-32 compat-gcc-32-c++ subversion ncurses-devel unixODBC-devel make wget' -NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ ' +NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ make' NEEDED_PACKAGES_PKG_ADD=''

1 0

[commit] r13159 - freeswitch/trunk/support-d
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Sun Apr 26 22:07:55 2009 New Revision: 13159 Log: update Modified: freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Sun Apr 26 22:07:55 2009 @@ -178,7 +178,7 @@ ;; Customize face attributes (setq font-lock-face-attributes ;; Symbol-for-Face Foreground Background Bold Italic Underline - '((font-lock-comment-face "DarkGreen") + '((font-lock-comment-face "green") (font-lock-preprocessor-face "gray") (font-lock-string-face "Sienna") (font-lock-keyword-face "purple") @@ -186,6 +186,13 @@ (font-lock-variable-name-face "Yellow") (font-lock-type-face "Yellow") (font-lock-reference-face "Purple") + + (font-lock-builtin-face "limegreen") + (font-lock-constant-face "yellow") + (font-lock-doc-face "limegreen") + (font-lock-highlighting-face "limegreen") + (font-lock-warning-face "limegreen") + )) ;; Load the font-lock package. (require 'font-lock) @@ -197,6 +204,10 @@ + + + +

1 0

[commit] r13158 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Sun Apr 26 21:04:48 2009 New Revision: 13158 Log: make a little more optimal Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Sun Apr 26 21:04:48 2009 @@ -36,6 +36,8 @@ #include <math.h> #include <string.h> +#define FRAME_QUEUE_LEN 3 + SWITCH_MODULE_LOAD_FUNCTION(mod_loopback_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_loopback_shutdown); SWITCH_MODULE_DEFINITION(mod_loopback, mod_loopback_load, mod_loopback_shutdown, NULL); @@ -187,7 +189,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); - switch_queue_create(&tech_pvt->frame_queue, 3, switch_core_session_get_pool(session)); + switch_queue_create(&tech_pvt->frame_queue, FRAME_QUEUE_LEN, switch_core_session_get_pool(session)); tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); } @@ -658,18 +660,21 @@ if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { switch_frame_t *clone; + if (frame->codec->implementation != tech_pvt->write_codec.implementation) { /* change codecs to match */ tech_init(tech_pvt, session, frame->codec); tech_init(tech_pvt->other_tech_pvt, tech_pvt->other_session, frame->codec); } - if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) { - abort(); - } + if (switch_queue_size(tech_pvt->other_tech_pvt->frame_queue) < FRAME_QUEUE_LEN) { + if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) { + abort(); + } - if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { - switch_frame_free(&clone); + if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { + switch_frame_free(&clone); + } } switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);

1 0

[commit] r13157 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Apr '09

26 Apr '09

Author: anthm Date: Sun Apr 26 17:10:28 2009 New Revision: 13157 Log: drop excess frames on loopback channel Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Apr 26 17:10:28 2009 @@ -31,7 +31,7 @@ * */ //#define DEBUG_2833 -#define RTP_DEBUG_WRITE_DELTA +//#define RTP_DEBUG_WRITE_DELTA #include <switch.h> #include <switch_stun.h> #undef PACKAGE_NAME @@ -2235,13 +2235,12 @@ bytes = sbytes; } -#undef RTP_DEBUG_WRITE_DELTA + #ifdef RTP_DEBUG_WRITE_DELTA { switch_time_t now = switch_time_now(); int delta = (int) (now - rtp_session->send_time) / 1000; - //assert(delta); - //printf("WRITE %d delta %d\n", (int)bytes, delta); + printf("WRITE %d delta %d\n", (int)bytes, delta); rtp_session->send_time = now; } #endif

1 0

[commit] r13156 - in freeswitch/trunk/src: . mod/endpoints/mod_loopback
by FreeSWITCH SVN 26 Apr '09

26 Apr '09

Author: anthm Date: Sun Apr 26 17:10:05 2009 New Revision: 13156 Log: drop excess frames on loopback channel Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Sun Apr 26 17:10:05 2009 @@ -187,7 +187,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); - switch_queue_create(&tech_pvt->frame_queue, 50000, switch_core_session_get_pool(session)); + switch_queue_create(&tech_pvt->frame_queue, 3, switch_core_session_get_pool(session)); tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); } @@ -503,7 +503,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL CONSUME_MEDIA\n"); - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_SUCCESS; } static switch_status_t channel_send_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf) @@ -548,9 +548,7 @@ goto end; } - if (!switch_queue_size(tech_pvt->frame_queue)) { - switch_core_timer_next(&tech_pvt->timer); - } + switch_core_timer_next(&tech_pvt->timer); if (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { if (tech_pvt->write_frame) { @@ -669,8 +667,11 @@ if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) { abort(); } + + if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { + switch_frame_free(&clone); + } - switch_queue_push(tech_pvt->other_tech_pvt->frame_queue, clone); switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); status = SWITCH_STATUS_SUCCESS; } @@ -727,10 +728,10 @@ switch_frame_t *frame = (switch_frame_t *) pop; switch_frame_free(&frame); } - /* avoid endless loop by not forwarding it when it came from this same place */ - if (tech_pvt->other_session && strcmp(msg->_file, __FILE__)) { - /* pass message over to the other leg */ - switch_core_session_receive_message(tech_pvt->other_session, msg); + + while (switch_queue_trypop(tech_pvt->other_tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + switch_frame_t *frame = (switch_frame_t *) pop; + switch_frame_free(&frame); } } break; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Apr 26 17:10:05 2009 @@ -31,6 +31,7 @@ * */ //#define DEBUG_2833 +#define RTP_DEBUG_WRITE_DELTA #include <switch.h> #include <switch_stun.h> #undef PACKAGE_NAME @@ -203,6 +204,11 @@ uint32_t cng_count; switch_rtp_bug_flag_t rtp_bugs; switch_rtp_stats_t stats; + +#ifdef RTP_DEBUG_WRITE_DELTA + switch_time_t send_time; +#endif + }; static int global_init = 0; @@ -2229,6 +2235,18 @@ bytes = sbytes; } +#undef RTP_DEBUG_WRITE_DELTA +#ifdef RTP_DEBUG_WRITE_DELTA + { + switch_time_t now = switch_time_now(); + int delta = (int) (now - rtp_session->send_time) / 1000; + //assert(delta); + //printf("WRITE %d delta %d\n", (int)bytes, delta); + rtp_session->send_time = now; + } +#endif + + if (switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_addr, 0, (void *) send_msg, &bytes) != SWITCH_STATUS_SUCCESS) { rtp_session->seq--; ret = -1;

1 0

[commit] r13155 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 26 Apr '09

26 Apr '09

Author: buklov Date: Sun Apr 26 15:11:33 2009 New Revision: 13155 Log: fix 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 Sun Apr 26 15:11:33 2009 @@ -32,7 +32,7 @@ <prompt phrase="Y" filename="121.wav"/> <prompt phrase="Z" filename="122.wav"/> </ascii> - <phonetic> + <phonetic-ascii> <prompt phrase="Пробел" filename="32.wav"/> <prompt phrase="Точка" filename="46.wav"/> <prompt phrase="Alpha" filename="97.wav"/> @@ -61,7 +61,7 @@ <prompt phrase="Xray" filename="120.wav"/> <prompt phrase="Yankee" filename="121.wav"/> <prompt phrase="Zulu" filename="122.wav"/> - </phonetic> + </phonetic-ascii> <digits> <prompt phrase="ноль" filename="0.wav"/> <prompt phrase="нулевая" filename="h-0f.wav"/> @@ -390,7 +390,7 @@ <prompt phrase="новых срочных" filename="vm-urgent-newx.wav"/>  <prompt phrase="новое срочное" filename="vm-urgent-new.wav"/>  <prompt phrase="новое" filename="vm-new.wav"/>  - <prompt phrase="новых" filename="vm-newx .wav"/>  + <prompt phrase="новых" filename="vm-newx.wav"/>  <prompt phrase="срочное сообщение сохранено" filename="vm-urgent-saved.wav"/>  <prompt phrase="сохранено" filename="vm-saved.wav"/>  <prompt phrase="сообщение" filename="vm-message.wav"/>

1 0

[commit] r13154 - freeswitch/trunk/support-d
by FreeSWITCH SVN 26 Apr '09

26 Apr '09

Author: anthm Date: Sun Apr 26 10:44:55 2009 New Revision: 13154 Log: fix keys Modified: freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Sun Apr 26 10:44:55 2009 @@ -84,12 +84,17 @@ (global-unset-key "\C-b" ) (global-set-key "\C-b" 'backward-word) (global-unset-key "\M-f" ) + + (global-set-key "\M-f" 'find-file) (global-set-key "\M-o" 'find-file-other-window) (global-set-key "\M-\\" 'mark-word) -(global-set-key "\M-[" 'mark-whole-buffer) -(global-unset-key "\M-]") -(global-set-key "\M-]" 'indent-region) +(global-set-key "\M-{" 'mark-whole-buffer) +;(global-unset-key "\M-}") + + + +(global-set-key "\M-}" 'indent-region) (global-set-key "\C-x\C-m" 'save-buffer) (global-set-key "\C-c\C-m" 'delete-other-windows) (global-set-key "\C-c\'" 'split-window-vertically)

1 0