September 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2705 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: mikej Date: Thu Sep 14 19:05:27 2006 New Revision: 2705 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: move inside the if. 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 Sep 14 19:05:27 2006 @@ -1344,12 +1344,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s entering state [%s]\n", switch_channel_get_name(channel), nua_callstate_name(ss_state)); - } - if (r_sdp) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp); - tech_pvt->remote_sdp_str = switch_core_session_strdup(session, (char *)r_sdp); + if (r_sdp) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp); + tech_pvt->remote_sdp_str = switch_core_session_strdup(session, (char *)r_sdp); + } } + switch ((enum nua_callstate)ss_state) { case nua_callstate_init:

1 0

[commit] r2704 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/codecs/mod_g711 mod/endpoints/mod_exosip mod/timers/mod_threadtimer
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: anthm Date: Thu Sep 14 18:11:30 2006 New Revision: 2704 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Log: misc Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Sep 14 18:11:30 2006 @@ -709,6 +709,10 @@ write_frame.data = data; write_frame.buflen = sizeof(data); write_frame.codec = &member->write_codec; + + if (switch_test_flag(member->conference, CFLAG_ANSWERED)) { + switch_channel_answer(channel); + } /* Start a thread to read data and feed it into the buffer and use this thread to generate output */ launch_input_thread(member, switch_core_session_get_pool(member->session)); @@ -957,7 +961,7 @@ } } } /* Rinse ... Repeat */ - + switch_clear_flag_locked(member, MFLAG_RUNNING); switch_core_timer_destroy(&timer); @@ -2344,9 +2348,12 @@ if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { goto done; } - } //else + } else { // if we're not using "bridge:" set the conference answered flag - //switch_set_flag(conference, CFLAG_ANSWERED); + // and this isn't an outbound channel, answer the call + if (!switch_channel_test_flag(channel, CF_OUTBOUND)) + switch_set_flag(conference, CFLAG_ANSWERED); + } Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Thu Sep 14 18:11:30 2006 @@ -187,8 +187,8 @@ /* Registration */ -#if 0 + static const switch_codec_implementation_t g711u_8k_60ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -208,7 +208,7 @@ /*.destroy */ switch_g711u_destroy }; - +#if 0 static const switch_codec_implementation_t g711u_8k_30ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -268,6 +268,7 @@ /*.decode */ switch_g711u_decode, /*.destroy */ switch_g711u_destroy, ///*.next */ &g711u_16k_implementation + &g711u_8k_60ms_implementation }; Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Thu Sep 14 18:11:30 2006 @@ -585,7 +585,7 @@ ms, flags, key, - "soft", + "thread_soft", &err, switch_core_session_get_pool(tech_pvt->session)); if (switch_rtp_ready(tech_pvt->rtp_session)) { Modified: freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_threadtimer/mod_threadtimer.c Thu Sep 14 18:11:30 2006 @@ -37,16 +37,18 @@ static struct { int32_t RUNNING; switch_mutex_t *mutex; + uint32_t timer_milliseconds; + uint32_t timer_microseconds; } globals; static const char modname[] = "mod_threadtimer"; #define MAX_ELEMENTS 1000 struct timer_private { - uint32_t tick; - uint32_t reference; + uint64_t tick; + uint64_t reference; uint32_t interval; - switch_mutex_t *mutex; + //switch_mutex_t *mutex; struct timer_private *next; }; @@ -60,11 +62,30 @@ static timer_head_t *TIMER_MATRIX[MAX_ELEMENTS+1]; +#define IDLE_SPEED 100 + +static inline void set_timer(void) +{ + uint32_t index = 0, min = IDLE_SPEED; + + for(index = 0; index < MAX_ELEMENTS; index++) { + if (TIMER_MATRIX[index] && TIMER_MATRIX[index]->private_info) { + if (min > index) { + min = index; + } + } + } + + globals.timer_milliseconds = min; + globals.timer_microseconds = min * 1000; +} + static inline switch_status_t timer_init(switch_timer_t *timer) { timer_private_t *private_info; timer_head_t *head; + if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) { timer->private_info = private_info; if (!TIMER_MATRIX[timer->interval]) { @@ -76,35 +97,28 @@ head = TIMER_MATRIX[timer->interval]; - switch_mutex_init(&private_info->mutex, SWITCH_MUTEX_NESTED, timer->memory_pool); + //switch_mutex_init(&private_info->mutex, SWITCH_MUTEX_NESTED, timer->memory_pool); private_info->interval = timer->interval; switch_mutex_lock(head->mutex); private_info->next = head->private_info; head->private_info = private_info; switch_mutex_unlock(head->mutex); - + set_timer(); + return SWITCH_STATUS_SUCCESS; } return SWITCH_STATUS_MEMERR; } -#define MAX_TICKS 0xFFFFFF00 -#define check_overflow(p) if (p->reference > MAX_TICKS) {\ - switch_mutex_lock(p->mutex);\ - p->reference = p->tick = 0;\ - switch_mutex_unlock(p->mutex);\ - }\ - - static inline switch_status_t timer_step(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; - switch_mutex_lock(private_info->mutex); + //switch_mutex_lock(private_info->mutex); private_info->reference += private_info->interval; - switch_mutex_unlock(private_info->mutex); + //switch_mutex_unlock(private_info->mutex); return SWITCH_STATUS_SUCCESS; } @@ -119,7 +133,6 @@ while (private_info->tick < private_info->reference) { switch_yield(1000); } - check_overflow(private_info); timer->samplecount += timer->samples; return SWITCH_STATUS_SUCCESS; @@ -131,15 +144,14 @@ timer_private_t *private_info = timer->private_info; switch_status_t status; - switch_mutex_lock(private_info->mutex); + //switch_mutex_lock(private_info->mutex); if (private_info->tick < private_info->reference) { status = SWITCH_STATUS_FALSE; } else { private_info->reference += private_info->interval; - check_overflow(private_info); status = SWITCH_STATUS_SUCCESS; } - switch_mutex_unlock(private_info->mutex); + //switch_mutex_unlock(private_info->mutex); return status; } @@ -167,7 +179,7 @@ last = ptr; } switch_mutex_unlock(head->mutex); - + set_timer(); timer->private_info = NULL; return SWITCH_STATUS_SUCCESS; } @@ -205,6 +217,8 @@ return SWITCH_STATUS_SUCCESS; } + + SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) { switch_time_t reference = switch_time_now(); @@ -214,19 +228,22 @@ memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); + globals.timer_microseconds = IDLE_SPEED * 1000; + globals.timer_milliseconds = IDLE_SPEED; globals.RUNNING = 1; while(globals.RUNNING == 1) { - reference += 1000; - + reference += globals.timer_microseconds; + //printf("TEST %d\n", globals.timer_microseconds); while (switch_time_now() < reference) { - switch_yield(500); + //switch_yield((reference - now) - 1000); + switch_yield(globals.timer_microseconds >> 1); } - current_ms++; + current_ms += globals.timer_milliseconds; - for (x = 0; x < 1000; x++) { + for (x = 0; x < MAX_ELEMENTS; x++) { int i = x, index; if (i == 0) { i = 1; @@ -237,9 +254,9 @@ if (TIMER_MATRIX[index] && TIMER_MATRIX[index]->private_info) { switch_mutex_lock(TIMER_MATRIX[index]->mutex); for (ptr = TIMER_MATRIX[index]->private_info; ptr; ptr = ptr->next) { - switch_mutex_lock(ptr->mutex); + //switch_mutex_lock(ptr->mutex); ptr->tick += ptr->interval; - switch_mutex_unlock(ptr->mutex); + //switch_mutex_unlock(ptr->mutex); } switch_mutex_unlock(TIMER_MATRIX[index]->mutex); } Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Sep 14 18:11:30 2006 @@ -62,7 +62,7 @@ #ifdef WIN32 SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); #else - //nice(-20); + //nice(-19); #endif } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Sep 14 18:11:30 2006 @@ -3624,6 +3624,7 @@ switch_event_fire(&event); } +//#define USE_MLOCKALL #ifdef HAVE_MLOCKALL #ifdef USE_MLOCKALL mlockall(MCL_CURRENT|MCL_FUTURE);

1 0

[commit] r2703 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: anthm Date: Thu Sep 14 17:12:39 2006 New Revision: 2703 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: no data means bad read 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 Sep 14 17:12:39 2006 @@ -908,8 +908,13 @@ } } - + switch_clear_flag_locked(tech_pvt, TFLAG_READING); + + if (tech_pvt->read_frame.datalen == 0) { + *frame = NULL; + return SWITCH_STATUS_GENERR; + } *frame = &tech_pvt->read_frame;

1 0

[commit] r2702 - freeswitch/trunk/src/mod/loggers/mod_syslog
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: anthm Date: Thu Sep 14 14:58:38 2006 New Revision: 2702 Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Log: fix syslog (thanks justin unger) 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 Thu Sep 14 14:58:38 2006 @@ -103,42 +103,19 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) -{ - switch_status_t status; - *interface = &console_module_interface; - - if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { - return status; - } - - openlog(globals.ident, LOG_PID, LOG_USER); - - switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); - - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_unload(const switch_loadable_module_interface_t **interface) -{ - closelog(); - - return SWITCH_STATUS_SUCCESS; -} - static switch_status_t load_config(void) { - switch_config_t cfg; - char *var, *val; char *cf = "syslog.conf"; + switch_xml_t cfg, xml, settings, param; - memset(&globals, 0, sizeof(globals)); - - if (switch_config_open_file(&cfg, cf)) { + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + } else { + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); - while (switch_config_next_pair(&cfg, &var, &val)) { - if (!strcasecmp(cfg.category, "settings")) { if (!strcmp(var, "ident")) { set_global_ident(val); } else if (!strcmp(var, "facility")) { @@ -148,12 +125,12 @@ } else if (!strcmp(var, "level")) { set_global_level(val);; } + } } - - switch_config_close_file(&cfg); + switch_xml_free(xml); } - + if (switch_strlen_zero(globals.ident)) { set_global_ident(DEFAULT_IDENT); } @@ -167,5 +144,30 @@ set_global_level(DEFAULT_LEVEL); } + + return 0; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) +{ + switch_status_t status; + *interface = &console_module_interface; + + if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { + return status; + } + + openlog(globals.ident, LOG_PID, LOG_USER); + + switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); + return SWITCH_STATUS_SUCCESS; } + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_unload(const switch_loadable_module_interface_t **interface) +{ + closelog(); + + return SWITCH_STATUS_SUCCESS; +} +

1 0

[commit] r2701 - freeswitch/trunk/src/mod/languages/mod_mono
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: james Date: Thu Sep 14 10:48:26 2006 New Revision: 2701 Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Log: Changes needed to build correctly, tested under linux, please let me know how other platforms go. Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/Makefile Thu Sep 14 10:48:26 2006 @@ -1,19 +1,25 @@ VERSION = mono-1.1.13.8 TARBALL = mono-1.1.13.8.tar.gz -CFLAGS += `pkg-config --cflags mono` -LDFLAGS += `pkg-config --libs mono` +GLIB_TARBALL = glib-2.12.3.tar.gz +GETTEXT_TARBALL = gettext-0.15.tar.gz +PKGCONFIG_TARBALL = pkg-config-0.21.tar.gz +CFLAGS += `$(PREFIX)/bin/pkg-config --cflags mono` +LDFLAGS += `$(PREFIX)/bin/pkg-config --libs mono` all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(TARBALL) --prefix=$(PREFIX) --with-pic + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(PKGCONFIG_TARBALL) --prefix=$(PREFIX) --with-pic + export PKG_CONFIG=$(PREFIX)/bin/pkg-config; export MSGFMT=$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(GLIB_TARBALL) --prefix=$(PREFIX) --with-pic + export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(TARBALL) --prefix=$(PREFIX) --with-pic %.o: %.c $(CC) -fPIC $(CFLAGS) -c -o $@ $< $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o - $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) + $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Thu Sep 14 10:48:26 2006 @@ -36,12 +36,12 @@ #include <mono/metadata/debug-helpers.h> #include <mono/metadata/image.h> #include <mono/metadata/threads.h> -#include <gc/gc.h> +//#include <gc/gc.h> #include <switch.h> #define SWITCH_MONO_MODULES "mono/" #define SWITCH_MONO_LIBDIR "lib/" -#define SWITCH_MONO_ASSEMBLY "Freeswitch.dll" +#define SWITCH_MONO_ASSEMBLY "FreeSwitch.dll" /* Module functions */ switch_status_t mod_mono_load_modules(const char *module_dir); @@ -90,7 +90,7 @@ return SWITCH_STATUS_FALSE; } - /* Construct the path to the Freeswitch assembly, then check to make sure it exists */ + /* Construct the path to the FreeSwitch assembly, then check to make sure it exists */ switch_size_t assembly_dir_len = strlen(SWITCH_GLOBAL_dirs.base_dir) + strlen(SWITCH_MONO_LIBDIR) + 2; /* Account for / and \0 */ switch_size_t assembly_file_len = assembly_dir_len + strlen(SWITCH_MONO_ASSEMBLY); char *assembly_dir = (char *) switch_core_alloc(mono_pool, assembly_dir_len); @@ -102,11 +102,11 @@ snprintf(assembly_file, assembly_file_len, "%s/%s%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR, SWITCH_MONO_ASSEMBLY); if (apr_stat(finfo, assembly_file, 0, mono_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not find Freeswitch.NET assembly"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not find FreeSwitch.NET assembly\n"); return SWITCH_STATUS_FALSE; } - /* Mono wants to know where it will be able to find the Freeswitch assembly if it's not in the GAC */ + /* Mono wants to know where it will be able to find the FreeSwitch assembly if it's not in the GAC */ if (getenv("MONO_PATH") != NULL) { switch_size_t mono_path_len = strlen(getenv("MONO_PATH")) + strlen(assembly_dir) + 2; /* Account for : and \0 */ char *mono_path = (char *) switch_core_alloc(mono_pool, mono_path_len); @@ -144,7 +144,7 @@ for (p = switch_hash_first(mono_pool, globals.plugins); p; p = switch_hash_next(p)) { mono_plugin *plugin = (mono_plugin *) switch_core_alloc(mono_pool, sizeof(*plugin)); - switch_size_t *key_length = NULL; + apr_ssize_t *key_length = NULL; const void *key = NULL; void *value = NULL;

1 0

[commit] r2700 - freeswitch/branches/waverly
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 10:26:30 2006 New Revision: 2700 Added: freeswitch/branches/waverly/ Log: Creating empty folder for waverly

1 0

[commit] r2699 - freeswitch/branches/bsjaekel
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 07:55:24 2006 New Revision: 2699 Added: freeswitch/branches/bsjaekel/ Log: Creating empty folder for bsjaekel

1 0

[commit] r2698 - freeswitch/branches/haisenko
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 06:52:24 2006 New Revision: 2698 Added: freeswitch/branches/haisenko/ Log: Creating empty folder for haisenko

1 0

[commit] r2697 - freeswitch/branches/dede
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 05:43:23 2006 New Revision: 2697 Added: freeswitch/branches/dede/ Log: Creating empty folder for dede

1 0

[commit] r2696 - freeswitch/branches/paulb
by Freeswitch SVN 14 Sep '06

14 Sep '06

Author: sphere Date: Thu Sep 14 01:43:24 2006 New Revision: 2696 Added: freeswitch/branches/paulb/ Log: Creating empty folder for paulb

1 0