March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12861 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 18:57:07 2009 New Revision: 12861 Log: speed up loop 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 Tue Mar 31 18:57:07 2009 @@ -640,7 +640,8 @@ uint32_t gateway_loops = 0; int loops = 0; uint32_t qsize; - + void *pop; + ireg_loops = IREG_SECONDS; gateway_loops = GATEWAY_SECONDS; @@ -652,7 +653,6 @@ while ((mod_sofia_globals.running == 1 && sofia_test_pflag(profile, PFLAG_RUNNING)) || qsize) { if (qsize) { - void *pop; switch_mutex_lock(profile->ireg_mutex); while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); @@ -675,10 +675,17 @@ loops = 0; } - switch_yield(10000); + switch_cond_next(); qsize = switch_queue_size(profile->sql_queue); } + switch_mutex_lock(profile->ireg_mutex); + while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); + free(pop); + } + switch_mutex_unlock(profile->ireg_mutex); + sofia_clear_pflag_locked(profile, PFLAG_WORKER_RUNNING); return NULL;

1 0

[commit] r12860 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl mod_python mod_spidermonkey
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 18:56:47 2009 New Revision: 12860 Log: remove old code Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Mar 31 18:56:47 2009 @@ -438,38 +438,11 @@ return SWITCH_STATUS_SUCCESS; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.lua", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - lua_thread(cmd); - switch_safe_free(cmd); - } - - switch_safe_free(path); - } -} - SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load) { switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Tue Mar 31 18:56:47 2009 @@ -429,24 +429,6 @@ return xml; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char path[512], *cmd; - - switch_snprintf(path, sizeof(path), "%s%smwi.pl", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - perl_thread(cmd); - switch_safe_free(cmd); - } - } -} - static switch_status_t do_config(void) { char *cf = "perl.conf"; @@ -491,12 +473,6 @@ globals.pool = pool; - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - if (!(my_perl = perl_alloc())) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate perl interpreter\n"); return SWITCH_STATUS_MEMERR; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 31 18:56:47 2009 @@ -333,26 +333,6 @@ return 0; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.py", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - py_thread(cmd); - switch_safe_free(cmd); - } - switch_safe_free(path); - } -} - SWITCH_STANDARD_API(launch_python) { @@ -372,12 +352,6 @@ switch_application_interface_t *app_interface; char *pp = getenv("PYTHONPATH"); - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - if (pp) { char *path = switch_mprintf("%s:%s", pp, SWITCH_GLOBAL_dirs.script_dir); setenv("PYTHONPATH", path, 1); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 31 18:56:47 2009 @@ -3695,27 +3695,6 @@ return SWITCH_STATUS_SUCCESS; } -static void message_query_handler(switch_event_t *event) -{ - char *account = switch_event_get_header(event, "message-account"); - - if (account) { - char *path, *cmd; - - path = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - switch_assert(path != NULL); - - if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { - cmd = switch_mprintf("%s %s", path, account); - switch_assert(cmd != NULL); - js_thread_launch(cmd); - switch_safe_free(cmd); - } - - switch_safe_free(path); - } -} - SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load) { switch_application_interface_t *app_interface; @@ -3725,12 +3704,6 @@ return status; } - if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]");

1 0

[commit] r12859 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: stkn Date: Tue Mar 31 18:36:35 2009 New Revision: 12859 Log: Flite does not like the "-std=c99" flag, use the fix from mod_xml_ldap (for openldap) to remove it from CFLAGS before calling the flite configure script Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Tue Mar 31 18:36:35 2009 @@ -17,7 +17,7 @@ $(GETLIB) $(FLITE)-latest.tar.gz $(FLITE_DIR)/Makefile: $(FLITE_DIR) - cd $(FLITE_DIR) && ./configure --without-audio --with-pic --disable-shared + cd $(FLITE_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure --without-audio --with-pic --disable-shared $(TOUCH_TARGET) $(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile

1 0

[commit] r12858 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 15:55:26 2009 New Revision: 12858 Log: linux... how did that not crash every time Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:55:26 2009 @@ -1119,9 +1119,10 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { + int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != (*event)->priority) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + if (index != was) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); } goto end; }

1 0

[commit] r12857 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: mikej Date: Tue Mar 31 15:54:31 2009 New Revision: 12857 Log: revert Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 31 15:54:31 2009 @@ -3319,10 +3319,8 @@ msg_maxsize(msg, agent->sa_maxsize); - if (1 || agent->sa_preload) { - isize_t preload = (dlen + agent->sa_preload + 1023) & ~1023; - su_home_preload(msg_home(msg), 1, preload); - } + if (agent->sa_preload) + su_home_preload(msg_home(msg), 1, dlen + agent->sa_preload); return msg; } 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 Mar 31 15:54:31 2009 @@ -744,7 +744,6 @@ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), - NTATAG_PRELOAD(2048), TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:54:31 2009 @@ -1119,10 +1119,9 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { - int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != was) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); + if (index != (*event)->priority) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); } goto end; }

1 0

[commit] r12856 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: mikej Date: Tue Mar 31 15:51:35 2009 New Revision: 12856 Log: linux... how did that not crash every time Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 31 15:51:35 2009 @@ -3319,8 +3319,10 @@ msg_maxsize(msg, agent->sa_maxsize); - if (agent->sa_preload) - su_home_preload(msg_home(msg), 1, dlen + agent->sa_preload); + if (1 || agent->sa_preload) { + isize_t preload = (dlen + agent->sa_preload + 1023) & ~1023; + su_home_preload(msg_home(msg), 1, preload); + } return msg; } 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 Mar 31 15:51:35 2009 @@ -744,6 +744,7 @@ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), + NTATAG_PRELOAD(2048), TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Mar 31 15:51:35 2009 @@ -1119,9 +1119,10 @@ for (;;) { for (index = (*event)->priority; index < 3; index++) { + int was = (*event)->priority; if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { - if (index != (*event)->priority) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + if (index != was) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority %d/%d!\n", index, was); } goto end; }

1 0

[commit] r12855 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 15:30:13 2009 New Revision: 12855 Log: FSCORE-343 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Mar 31 15:30:13 2009 @@ -56,6 +56,7 @@ switch_memory_pool_t *pool; int has_outbound; int ready; + int is_static; }; typedef struct fifo_node fifo_node_t; @@ -1756,7 +1757,7 @@ void *val; for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); - if ((node = (fifo_node_t *) val)) { + if ((node = (fifo_node_t *) val) && node->is_static) { node->ready = 0; } } @@ -1845,6 +1846,7 @@ } node->ready = 1; + node->is_static = 1; switch_mutex_unlock(node->mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s configured\n", node->name); @@ -1862,11 +1864,10 @@ for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); - if (!(node = (fifo_node_t *) val) || node->ready) { + if (!(node = (fifo_node_t *) val) || !node->is_static || node->ready) { continue; } - if (node_consumer_wait_count(node) || node->consumer_count || node_idle_consumers(node)) { node->ready = 1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s not removed, still in use.\n", node->name);

1 0

[commit] r12854 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 14:10:43 2009 New Revision: 12854 Log: add rtp-autoflush profile param and rtp_autoflush var to skip timer sleeps when the socket has data ready and refactor the jitter buffer code out into a different function and fix it so it works in blocking mode too Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Mar 31 14:10:43 2009 @@ -470,7 +470,8 @@ SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17), SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19), - SWITCH_RTP_FLAG_FLUSH = (1 << 20) + SWITCH_RTP_FLAG_FLUSH = (1 << 20), + SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21) } switch_rtp_flag_enum_t; typedef uint32_t switch_rtp_flag_t; 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 Tue Mar 31 14:10:43 2009 @@ -181,6 +181,7 @@ PFLAG_MANAGE_SHARED_APPEARANCE, PFLAG_DISABLE_SRV, PFLAG_DISABLE_NAPTR, + PFLAG_AUTOFLUSH, /* No new flags below this line */ PFLAG_MAX 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 Mar 31 14:10:43 2009 @@ -1655,6 +1655,12 @@ } else { sofia_clear_pflag(profile, PFLAG_PASS_RFC2833); } + } else if (!strcasecmp(var, "rtp-autoflush")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFLUSH); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); + } } else if (!strcasecmp(var, "inbound-codec-negotiation")) { if (!strcasecmp(val, "greedy")) { sofia_set_pflag(profile, PFLAG_GREEDY); @@ -2181,6 +2187,12 @@ if (switch_true(val)) { sofia_set_pflag(profile, PFLAG_PASS_RFC2833); } + } else if (!strcasecmp(var, "rtp-autoflush")) { + if (switch_true(val)) { + sofia_set_pflag(profile, PFLAG_AUTOFLUSH); + } else { + sofia_clear_pflag(profile, PFLAG_AUTOFLUSH); + } } else if (!strcasecmp(var, "inbound-codec-negotiation")) { if (!strcasecmp(val, "greedy")) { sofia_set_pflag(profile, PFLAG_GREEDY); 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 Mar 31 14:10:43 2009 @@ -2054,6 +2054,12 @@ flags |= SWITCH_RTP_FLAG_PASS_RFC2833; } + + if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTOFLUSH) + || ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_autoflush")) && switch_true(val))) { + flags |= SWITCH_RTP_FLAG_AUTOFLUSH; + } + if (!(sofia_test_pflag(tech_pvt->profile, PFLAG_REWRITE_TIMESTAMPS) || ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_rewrite_timestamps")) && !switch_true(val)))) { flags |= SWITCH_RTP_FLAG_RAW_WRITE; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Mar 31 14:10:43 2009 @@ -599,10 +599,10 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); - } else { - switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); } + switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); + status = SWITCH_STATUS_SUCCESS; *err = "Success"; switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); @@ -1016,13 +1016,8 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { - if (rtp_session->read_pollfd) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't use jitterbuffer without a timer.\n"); - return SWITCH_STATUS_FALSE; - } rtp_session->jb = stfu_n_init(queue_frames); - switch_socket_create_pollfd(&rtp_session->jb_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); return SWITCH_STATUS_SUCCESS; } @@ -1371,18 +1366,53 @@ #define return_cng_frame() do_cng = 1; goto timer_check +static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t *bytes, switch_frame_flag_t *flags) +{ + switch_status_t status = SWITCH_STATUS_FALSE; + stfu_frame_t *jb_frame; + + switch_assert(bytes); + + *bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, bytes); + + if (rtp_session->jb && rtp_session->recv_msg.header.version == 2 && *bytes) { + if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { + stfu_n_reset(rtp_session->jb); + } + + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, *bytes - rtp_header_len); + *bytes = 0; + status = SWITCH_STATUS_FALSE; + } + + if (rtp_session->jb) { + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + *bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + rtp_session->recv_msg.header.pt = rtp_session->payload; + status = SWITCH_STATUS_SUCCESS; + } + } + + return status; +} + static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_type, switch_frame_flag_t *flags, switch_io_flag_t io_flags) { switch_size_t bytes = 0; switch_status_t status = SWITCH_STATUS_SUCCESS, poll_status = SWITCH_STATUS_SUCCESS; int check = 0; - stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000; int poll_sec = 5; int poll_loop = 0; int fdr = 0; - int from_jb = 0; + int hot_socket = 0; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1398,42 +1428,24 @@ int do_cng = 0; if (rtp_session->timer.interval) { - int do_sleep = 1; - if (rtp_session->jb) { - if (switch_poll(rtp_session->jb_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { - do_sleep = 0; + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH)) { + if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { + hot_socket = 1; } } - if (do_sleep) { + if (!hot_socket) { switch_core_timer_next(&rtp_session->timer); } } recvfrom: - if (rtp_session->jb) { - if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - rtp_session->recv_msg.header.pt = rtp_session->payload; - from_jb = 1; - goto post_read; - } - } - - - if (rtp_session->read_pollfd) { + if (!rtp_session->timer.interval) { poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); } - - + if (poll_status == SWITCH_STATUS_SUCCESS) { - bytes = sizeof(rtp_msg_t); - status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + status = read_rtp_packet(rtp_session, &bytes, flags); } else { if (!SWITCH_STATUS_IS_BREAK(poll_status) && poll_status != SWITCH_STATUS_TIMEOUT) { ret = -1; @@ -1445,8 +1457,6 @@ bytes = 0; } - post_read: - if (bytes < 0) { ret = (int) bytes; goto end; @@ -1574,20 +1584,6 @@ goto end; } - if (rtp_session->jb && !from_jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { - if (bytes) { - - if (rtp_session->recv_msg.header.m) { - stfu_n_reset(rtp_session->jb); - } - - stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); - bytes = 0; - goto recvfrom; - } - } - - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV)) { int sbytes = (int) bytes; err_status_t stat = 0; @@ -1749,14 +1745,7 @@ } if (check || (bytes && !rtp_session->timer.interval)) { - if (rtp_session->jb && (jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - } else if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ + if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) { switch_cond_next(); continue;

1 0

[commit] r12853 - freeswitch/trunk/libs/win32
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: mikej Date: Tue Mar 31 12:33:45 2009 New Revision: 12853 Log: Windows sphinx downloads for release mode (FSBUILD-146) Modified: freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj Modified: freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download pocketsphinx.2008.vcproj Tue Mar 31 12:33:45 2009 @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading pocketsphinx." - CommandLine="if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\pocketsphinx-0.5.99" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download sphinxbase.2008.vcproj Tue Mar 31 12:33:45 2009 @@ -85,7 +85,7 @@ <Tool Name="VCCustomBuildTool" Description="Downloading sphinxbase." - CommandLine="if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\sphinxbase-0.4.99" /> </FileConfiguration>

1 0

[commit] r12852 - freeswitch/trunk/src/mod/loggers/mod_syslog
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: mikej Date: Tue Mar 31 12:13:16 2009 New Revision: 12852 Log: fix string scope on globals (LOGGER-1) Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Tue Mar 31 12:13:16 2009 @@ -164,15 +164,16 @@ setlogmask(LOG_UPTO(LOG_DEBUG)); switch_log_bind_logger(mod_syslog_logger, log_level, SWITCH_FALSE); - switch_safe_free(globals.ident); - switch_safe_free(globals.format); - return SWITCH_STATUS_SUCCESS; } SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_syslog_shutdown) { closelog(); + + switch_safe_free(globals.ident); + switch_safe_free(globals.format); + switch_log_unbind_logger(mod_syslog_logger); return SWITCH_STATUS_SUCCESS;

1 0