- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13389 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 19 May '09

19 May '09

Author: anthm Date: Tue May 19 12:49:21 2009 New Revision: 13389 Log: make autoflush on bridge the default Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue May 19 12:49:21 2009 @@ -94,8 +94,8 @@ <param name="tls-version" value="$${sip_tls_version}"/>  -  + (reduces delay on latent connections default true, must be disabled explicitly)--> +    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 May 19 12:49:21 2009 @@ -2016,6 +2016,7 @@ profile->auto_restart = 1; sofia_set_pflag(profile, PFLAG_AUTOFIX_TIMING); sofia_set_pflag(profile, PFLAG_MESSAGE_QUERY_ON_REGISTER); + sofia_set_pflag(profile, PFLAG_RTP_AUTOFLUSH_DURING_BRIDGE); for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name");

1 0

[commit] r13388 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 12:25:08 2009 New Revision: 13388 Log: Tue May 19 12:00:30 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * su_uniqueid.c: Solaris misdefines PTHREAD_ONCE_INIT Ignore-this: 9fe2247164d572901ed4a30b009353db Solaris defines pthread_once_t as a struct containing an array. The initializer PTHREAD_ONCE_INIT needs two levels of brackets it but only has one. Original patch from Mike Jerris <mike(a)jerris.com>. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue May 19 12:25:08 2009 @@ -1 +1 @@ -Tue May 19 12:23:01 CDT 2009 +Tue May 19 12:24:21 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Tue May 19 12:25:08 2009 @@ -68,11 +68,38 @@ #include <signal.h> #endif +#if SU_HAVE_PTHREADS + +#include <pthread.h> + +#if __sun +#undef PTHREAD_ONCE_INIT +#define PTHREAD_ONCE_INIT {{ 0, 0, 0, PTHREAD_ONCE_NOTDONE }} +#endif + +static pthread_once_t once = PTHREAD_ONCE_INIT; +#define ONCE_INIT(f) pthread_once(&once, f) + +#else + +static int once; +#define ONCE_INIT(f) (!once ? (once = 1), f() : (void)0) + +#endif + #include "tport_tls.h" char const tls_version[] = OPENSSL_VERSION_TEXT; int tls_ex_data_idx = -1; /* see SSL_get_ex_new_index(3ssl) */ +static void +tls_init_once(void) +{ + SSL_library_init(); + SSL_load_error_strings(); + tls_ex_data_idx = SSL_get_ex_new_index(0, "sofia-sip private data", NULL, NULL, NULL); +} + enum { tls_master = 0, tls_slave = 1}; struct tls_s { @@ -218,15 +245,13 @@ static int tls_init_context(tls_t *tls, tls_issues_t const *ti) { - static int initialized = 0; int verify; + static int random_loaded; + + ONCE_INIT(tls_init_once); - if (!initialized) { - initialized = 1; - SSL_library_init(); - SSL_load_error_strings(); - tls_ex_data_idx = SSL_get_ex_new_index(0, \ - "sofia-sip private data", NULL, NULL, NULL); + if (!random_loaded) { + random_loaded = 1; if (ti->randFile && !RAND_load_file(ti->randFile, 1024 * 1024)) {

1 0

[commit] r13387 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 12:23:16 2009 New Revision: 13387 Log: Tue May 19 12:00:30 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * su_uniqueid.c: Solaris misdefines PTHREAD_ONCE_INIT Ignore-this: 9fe2247164d572901ed4a30b009353db Solaris defines pthread_once_t as a struct containing an array. The initializer PTHREAD_ONCE_INIT needs two levels of brackets it but only has one. Original patch from Mike Jerris <mike(a)jerris.com>. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue May 19 12:23:16 2009 @@ -1 +1 @@ -Tue May 19 09:46:18 CDT 2009 +Tue May 19 12:23:01 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c Tue May 19 12:23:16 2009 @@ -84,11 +84,12 @@ #include <pthread.h> -#if defined(__sun) -static pthread_once_t once = { PTHREAD_ONCE_INIT }; -#else -static pthread_once_t once = PTHREAD_ONCE_INIT; +#if __sun +#undef PTHREAD_ONCE_INIT +#define PTHREAD_ONCE_INIT {{ 0, 0, 0, PTHREAD_ONCE_NOTDONE }} #endif + +static pthread_once_t once = PTHREAD_ONCE_INIT; static int done_once = 1; static pthread_key_t state_key;

1 0

[commit] r13386 - in freeswitch/trunk/libs/apr: build include/arch/unix
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 11:47:09 2009 New Revision: 13386 Log: fix PTHREAD_MUTEX_RECURSIVE detection on SUSE 10 Modified: freeswitch/trunk/libs/apr/build/apr_threads.m4 freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h Modified: freeswitch/trunk/libs/apr/build/apr_threads.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_threads.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_threads.m4 Tue May 19 11:47:09 2009 @@ -224,7 +224,8 @@ dnl Check for recursive mutex support (per SUSv3). AC_DEFUN([APR_CHECK_PTHREAD_RECURSIVE_MUTEX], [ AC_CACHE_CHECK([for recursive mutex support], [apr_cv_mutex_recursive], -[AC_TRY_RUN([#include <sys/types.h> +[AC_TRY_RUN([#define _XOPEN_SOURCE=600 +#include <sys/types.h> #include <pthread.h> #include <stdlib.h> Modified: freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h (original) +++ freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h Tue May 19 11:47:09 2009 @@ -17,6 +17,10 @@ #ifndef PROC_MUTEX_H #define PROC_MUTEX_H +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE=600 +#endif + #include "apr.h" #include "apr_private.h" #include "apr_general.h" Modified: freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h (original) +++ freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h Tue May 19 11:47:09 2009 @@ -17,6 +17,10 @@ #ifndef THREAD_MUTEX_H #define THREAD_MUTEX_H +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE=600 +#endif + #include "apr.h" #include "apr_private.h" #include "apr_general.h"

1 0

[commit] r13385 - freeswitch/trunk/src
by FreeSWITCH SVN 19 May '09

19 May '09

Author: anthm Date: Tue May 19 10:38:45 2009 New Revision: 13385 Log: fixx off-by-one in xml preprocessor Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue May 19 10:38:45 2009 @@ -1147,7 +1147,7 @@ while (*rp && wp < ep) { if (*rp == '$' && *(rp + 1) == '$' && *(rp + 2) == '{') { - char *e = strchr(rp, '}'); + char *e = switch_find_end_paren(rp + 2, '{', '}'); if (e) { rp += 3; @@ -1160,6 +1160,7 @@ *wp++ = *p; } } + continue; } }

1 0

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

19 May '09

Author: mikej Date: Tue May 19 10:17:44 2009 New Revision: 13384 Log: don't do this if its zero try one SFSIP-143 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 Tue May 19 10:17:44 2009 @@ -1375,7 +1375,7 @@ new_expires = contact->m_expires; expi = (uint32_t) atoi(new_expires); - if (expi != sofia_private->gateway->freq) { + if (expi > 0 && expi != sofia_private->gateway->freq) { sofia_private->gateway->freq = expi; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Changing expire time to %d by request of proxy %s\n", expi, sofia_private->gateway->register_proxy);

1 0

[commit] r13383 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by FreeSWITCH SVN 19 May '09

19 May '09

Author: mikej Date: Tue May 19 09:46:38 2009 New Revision: 13383 Log: Fri May 15 11:31:44 CDT 2009 Michael Jerris <mike(a)jerris.com> * sdp_print.c: build errors fix Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue May 19 09:46:38 2009 @@ -1 +1 @@ -Fri May 15 11:18:36 CDT 2009 +Tue May 19 09:46:18 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Tue May 19 09:46:38 2009 @@ -87,9 +87,8 @@ sizeof(printer_memory_error.pr_buffer) }; -static void printing_error(sdp_printer_t *p, const char *fmt, ...); - static void print_session(sdp_printer_t *p, sdp_session_t const *session); +static void printing_error(sdp_printer_t *p, const char *fmt, ...); /** Print a SDP description. *

1 0

[commit] r13382 - freeswitch/trunk/src
by FreeSWITCH SVN 18 May '09

18 May '09

Author: anthm Date: Mon May 18 12:39:59 2009 New Revision: 13382 Log: MODAPP-280 Modified: freeswitch/trunk/src/switch_ivr_play_say.c 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 Mon May 18 12:39:59 2009 @@ -860,7 +860,8 @@ char *argv[128] = { 0 }; int argc; int cur; - + int done = 0; + switch_core_session_get_read_impl(session, &read_impl); if ((play_delimiter_val = switch_channel_get_variable(channel, "playback_delimiter"))) { @@ -898,7 +899,7 @@ argv[0] = (char *)file; } - for(cur = 0; switch_channel_ready(channel) && cur < argc; cur++) { + for(cur = 0; switch_channel_ready(channel) && !done && cur < argc; cur++) { file = argv[cur]; asis = 0; eof = 0; @@ -1125,7 +1126,6 @@ ilen = samples; for (;;) { - int done = 0; int do_speed = 1; int last_speed = -1;

1 0

[commit] r13381 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 18 May '09

18 May '09

Author: mikej Date: Mon May 18 12:34:35 2009 New Revision: 13381 Log: abolish mailbox attribute in users and use number-alias attribute instead MODAPP-218 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 Mon May 18 12:34:35 2009 @@ -1312,35 +1312,38 @@ return -1; } -static void resolve_id(const char **myid, const char *domain_name, const char *action) +static char *resolve_id(const char *myid, const char *domain_name, const char *action) { switch_xml_t xx_user, xx_domain, xx_domain_root; switch_event_t *params; + char *ret = (char *) myid; switch_event_create(&params, SWITCH_EVENT_GENERAL); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", action); - if (switch_xml_locate_user("id", *myid, domain_name, NULL, + if (switch_xml_locate_user("id", myid, domain_name, NULL, &xx_domain_root, &xx_domain, &xx_user, NULL, params) == SWITCH_STATUS_SUCCESS) { - *myid = switch_xml_attr(xx_user, "id"); + ret = strdup(switch_xml_attr(xx_user, "id")); switch_xml_free(xx_domain_root); } switch_event_destroy(&params); + return ret; } -static void message_count(vm_profile_t *profile, const char *myid, const char *domain_name, const char *myfolder, +static void message_count(vm_profile_t *profile, const char *id_in, const char *domain_name, const char *myfolder, int *total_new_messages, int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages) { char msg_count[80] = ""; callback_t cbt = { 0 }; char sql[256]; + char *myid; cbt.buf = msg_count; cbt.len = sizeof(msg_count); - resolve_id(&myid, domain_name, "message-count"); - + myid = resolve_id(id_in, domain_name, "message-count"); + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch=0", myid, domain_name, myfolder); @@ -1364,6 +1367,11 @@ myid, domain_name, myfolder, URGENT_FLAG_STRING); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_saved_urgent_messages = atoi(msg_count); + + if (myid != id_in) { + free(myid); + } + } #define VM_STARTSAMPLES 1024 * 32 @@ -2137,7 +2145,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", myid, domain_name); ok = 0; } else { - myid = switch_xml_attr(x_user, "id"); + myid = switch_core_session_strdup(session, switch_xml_attr(x_user, "id")); } switch_event_destroy(&params); @@ -2864,7 +2872,7 @@ if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, NULL, locate_params) == SWITCH_STATUS_SUCCESS) { - id = switch_xml_attr(x_user, "id"); + id = switch_core_session_strdup(session, switch_xml_attr(x_user, "id")); if ((x_params = switch_xml_child(x_user, "params"))) { for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); @@ -3104,7 +3112,7 @@ if (!x_domain_root) { switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, NULL, NULL); - id = switch_xml_attr(x_user, "id"); + id = switch_core_session_strdup(session, switch_xml_attr(x_user, "id")); } if (x_domain_root) { @@ -3783,15 +3791,16 @@ } -static void do_web(vm_profile_t *profile, const char *user, const char *domain, const char *host, const char *port, const char *uri, switch_stream_handle_t *stream) +static void do_web(vm_profile_t *profile, const char *user_in, const char *domain, const char *host, const char *port, const char *uri, switch_stream_handle_t *stream) { char buf[80] = ""; struct holder holder; char *sql; callback_t cbt = { 0 }; int ttl = 0; + char *user; - resolve_id(&user, domain, "web-vm"); + user = resolve_id(user_in, domain, "web-vm"); stream->write_function(stream, "Content-type: text/html\n\n"); memset(&holder, 0, sizeof(holder)); @@ -3824,6 +3833,10 @@ if (profile->web_tail) { stream->raw_write_function(stream, (uint8_t *) profile->web_tail, strlen(profile->web_tail)); } + + if (user != user_in) { + free(user); + } } #define VM_INJECT_USAGE "[group=]<box> <sound_file> [<cid_num>] [<cid_name>]"

1 0

[commit] r13380 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by FreeSWITCH SVN 18 May '09

18 May '09

Author: brian Date: Mon May 18 12:19:31 2009 New Revision: 13380 Log: remove mailbox from mod_xml_rpc also and check number-alias Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon May 18 12:19:31 2009 @@ -209,7 +209,7 @@ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", "check"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "number_alias", "check"); if (switch_xml_locate_user("id", user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, NULL, params) != SWITCH_STATUS_SUCCESS) { switch_event_destroy(&params); @@ -217,7 +217,7 @@ } switch_event_destroy(&params); - box = switch_xml_attr_soft(x_user, "mailbox"); + box = switch_xml_attr_soft(x_user, "number-alias"); if ((x_params = switch_xml_child(x_domain, "params"))) {

1 0