- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2734 - freeswitch/trunk/src
by Freeswitch SVN 18 Sep '06

18 Sep '06

Author: mikej Date: Mon Sep 18 01:08:55 2006 New Revision: 2734 Modified: freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c Log: Attribution. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Sep 18 01:08:55 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael Jerris <mike(a)jerris.com> * * * switch.c -- Main Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Sep 18 01:08:55 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael Jerris <mike(a)jerris.com> * * * switch_channel.c -- Media Channel Interface Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Sep 18 01:08:55 2006 @@ -24,6 +24,8 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael Jerris <mike(a)jerris.com> + * Paul D. Tinsley <pdt at jackhammer.org> * * * switch_core.c -- Main Core Library Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Sep 18 01:08:55 2006 @@ -24,6 +24,8 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Michael Jerris <mike(a)jerris.com> + * Paul D. Tinsley <pdt at jackhammer.org> * * * switch_event.c -- Event System

1 0

[commit] r2733 - in freeswitch/trunk: . src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729
by Freeswitch SVN 18 Sep '06

18 Sep '06

Author: mikej Date: Sun Sep 17 23:22:16 2006 New Revision: 2733 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj Log: Fix build targets and default build for sofia. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Sun Sep 17 23:22:16 2006 @@ -900,6 +900,7 @@ {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32 {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.ActiveCfg = Debug|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.Build.0 = Debug|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.ActiveCfg = Debug|Win32 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj Sun Sep 17 23:22:16 2006 @@ -183,7 +183,7 @@ </Configuration> <Configuration Name="Debug Passthrough|Win32" - OutputDirectory="$(ConfigurationName)" + OutputDirectory="Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" @@ -266,7 +266,7 @@ </Configuration> <Configuration Name="Release Passthrough|Win32" - OutputDirectory="$(ConfigurationName)" + OutputDirectory="Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj Sun Sep 17 23:22:16 2006 @@ -183,7 +183,7 @@ </Configuration> <Configuration Name="Debug Passthrough|Win32" - OutputDirectory="$(ConfigurationName)" + OutputDirectory="Debug" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" @@ -266,7 +266,7 @@ </Configuration> <Configuration Name="Release Passthrough|Win32" - OutputDirectory="$(ConfigurationName)" + OutputDirectory="Release" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

1 0

[commit] r2732 - in freeswitch/trunk: . src/mod/languages/mod_mono
by Freeswitch SVN 18 Sep '06

18 Sep '06

Author: brian Date: Sun Sep 17 23:06:55 2006 New Revision: 2732 Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/src/mod/languages/mod_mono/Makefile Log: Ok email address added for pdt ;) WE LOVE YOU MANsvn status Makefile.amsvn status Makefile.am Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Sun Sep 17 23:06:55 2006 @@ -26,7 +26,7 @@ Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) Stefan Knoblich - Various patches and support. Thanks. Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! - Paul D. Tinsley - Various patches and support. + Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> A big THANK YOU goes to: 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 Sun Sep 17 23:06:55 2006 @@ -12,7 +12,7 @@ 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 + export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack %.o: %.c $(CC) -fPIC $(CFLAGS) -c -o $@ $<

1 0

[commit] r2731 - freeswitch/trunk/libs/win32/pthread
by Freeswitch SVN 18 Sep '06

18 Sep '06

Author: mikej Date: Sun Sep 17 23:05:48 2006 New Revision: 2731 Modified: freeswitch/trunk/libs/win32/pthread/pthread.vcproj Log: change pthread to build and link static Modified: freeswitch/trunk/libs/win32/pthread/pthread.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pthread/pthread.vcproj (original) +++ freeswitch/trunk/libs/win32/pthread/pthread.vcproj Sun Sep 17 23:05:48 2006 @@ -50,7 +50,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" - PreprocessorDefinitions="__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -130,7 +130,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" - PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3"

1 0

[commit] r2730 - freeswitch/trunk
by Freeswitch SVN 18 Sep '06

18 Sep '06

Author: brian Date: Sun Sep 17 22:06:02 2006 New Revision: 2730 Modified: freeswitch/trunk/AUTHORS Log: Update Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Sun Sep 17 22:06:02 2006 @@ -26,6 +26,7 @@ Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) Stefan Knoblich - Various patches and support. Thanks. Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! + Paul D. Tinsley - Various patches and support. A big THANK YOU goes to:

1 0

[commit] r2729 - freeswitch/trunk/src/include
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: mikej Date: Sun Sep 17 18:40:19 2006 New Revision: 2729 Modified: freeswitch/trunk/src/include/switch_utils.h Log: add switch_yield for windows Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sun Sep 17 18:40:19 2006 @@ -166,10 +166,12 @@ /*! \brief Wait a desired number of microseconds and yield the CPU */ -#ifdef HAVE_USLEEP +#if defined(HAVE_USLEEP) #define switch_yield(ms) usleep(ms); +#elif defined(WIN32) +#define switch_yield(ms) Sleep((DWORD)((ms) / 1000)); #else -#define switch_yield(ms) apr_sleep((ms) * 10); //apr_thread_yield(); +#define switch_yield(ms) apr_sleep(ms); //apr_thread_yield(); #endif /*!

1 0

[commit] r2728 - in freeswitch/trunk/src: include mod/timers/mod_softtimer
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: mikej Date: Sun Sep 17 18:13:51 2006 New Revision: 2728 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: tweak softimer to not int type truncate microsecond interval time.c Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Sun Sep 17 18:13:51 2006 @@ -1053,6 +1053,9 @@ /** number of microseconds since 00:00:00 january 1, 1970 UTC */ typedef apr_time_t switch_time_t; + /** number of microseconds in the interval */ +typedef apr_interval_time_t switch_interval_time_t; + /** * a structure similar to ANSI struct tm with the following differences: * - tm_usec isn't an ANSI field Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sun Sep 17 18:13:51 2006 @@ -169,7 +169,7 @@ #ifdef HAVE_USLEEP #define switch_yield(ms) usleep(ms); #else -#define switch_yield(ms) apr_sleep(ms * 10); //apr_thread_yield(); +#define switch_yield(ms) apr_sleep((ms) * 10); //apr_thread_yield(); #endif /*! Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Sun Sep 17 18:13:51 2006 @@ -38,7 +38,7 @@ int32_t RUNNING; switch_mutex_t *mutex; uint32_t timer_milliseconds; - uint32_t timer_microseconds; + switch_interval_time_t timer_microseconds; } globals; static const char modname[] = "mod_softtimer";

1 0

[commit] r2727 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: docelmo Date: Sun Sep 17 18:06:47 2006 New Revision: 2727 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: Enable threads on Python Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Sun Sep 17 18:06:47 2006 @@ -6,7 +6,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads --enable-shared + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@

1 0

[commit] r2726 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: docelmo Date: Sun Sep 17 18:03:24 2006 New Revision: 2726 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile Log: Enable threads on Python Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Sun Sep 17 18:03:24 2006 @@ -6,7 +6,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads --enable-shared %.o: %.c $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@

1 0

[commit] r2725 - in freeswitch/trunk/src/mod: endpoints/mod_sofia timers/mod_softtimer
by Freeswitch SVN 17 Sep '06

17 Sep '06

Author: anthm Date: Sun Sep 17 17:57:20 2006 New Revision: 2725 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: experimental tweaks 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 Sun Sep 17 17:57:20 2006 @@ -812,9 +812,9 @@ size_t bytes = 0, samples = 0, frames = 0, ms = 0; switch_channel_t *channel = NULL; int payload = 0; - switch_time_t now, started = switch_time_now(), last_act = switch_time_now(); - unsigned int elapsed; - uint32_t hard_timeout = 60000 * 3; + //switch_time_t now, started = switch_time_now(), last_act = switch_time_now(); + //unsigned int elapsed; + //uint32_t hard_timeout = 60000 * 3; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -835,10 +835,12 @@ ms = tech_pvt->read_codec.implementation->microseconds_per_frame; if (tech_pvt->last_read) { +#if 0 elapsed = (unsigned int)((switch_time_now() - tech_pvt->last_read) / 1000); if (elapsed > 60000) { return SWITCH_STATUS_TIMEOUT; } +#endif } if (switch_test_flag(tech_pvt, TFLAG_IO)) { @@ -853,7 +855,7 @@ while (!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->read_frame.datalen == 0) { - now = switch_time_now(); + //now = switch_time_now(); tech_pvt->read_frame.flags = SFF_NONE; status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame); @@ -865,7 +867,7 @@ payload = tech_pvt->read_frame.payload; - +#if 0 elapsed = (unsigned int)((switch_time_now() - started) / 1000); if (timeout > -1) { @@ -878,7 +880,7 @@ if (elapsed >= hard_timeout) { return SWITCH_STATUS_BREAK; } - +#endif if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) { char dtmf[128]; switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf)); Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Sun Sep 17 17:57:20 2006 @@ -197,7 +197,8 @@ while (switch_time_now() < reference) { //switch_yield((reference - now) - 1000); - switch_yield(globals.timer_microseconds >> 1); + //switch_yield(globals.timer_microseconds >> 1); + switch_yield(1000); } current_ms += globals.timer_milliseconds;

1 0