- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12299 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 12:24:05 2009 New Revision: 12299 Log: Tue Feb 3 10:31:33 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_wait.h: added su_root_clone() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:24:05 2009 @@ -1 +1 @@ -Thu Feb 26 12:22:23 CST 2009 +Thu Feb 26 12:23:25 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_wait.h Thu Feb 26 12:24:05 2009 @@ -487,6 +487,9 @@ SOFIAPUBFUN int su_root_set_max_defer(su_root_t *, su_duration_t max_defer); SOFIAPUBFUN su_duration_t su_root_get_max_defer(su_root_t const *self); +SOFIAPUBFUN su_root_t *su_root_clone(su_root_t *root, su_root_magic_t *magic) + __attribute__((__malloc__)); + /* Timers */ SOFIAPUBFUN su_timer_t *su_timer_create(su_task_r const, su_duration_t msec) __attribute__((__malloc__)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Thu Feb 26 12:24:05 2009 @@ -409,6 +409,48 @@ return su_root_create_with_port(magic, su_port_create()); } +/* Initializer used by su_root_clone() */ +static int +su_root_clone_initializer(su_root_t *root, + su_root_magic_t *magic) +{ + *(su_root_t **)magic = root; + return 0; +} + +/** Create a a new root object sharing port/thread with existing one. + * + * Allocate and initialize the instance of su_root_t. + * + * @param magic pointer to user data + * + * @return A pointer to allocated su_root_t instance, NULL on error. + * + * @NEW_1_12_11 + */ +su_root_t * +su_root_clone(su_root_t *self, su_root_magic_t *magic) +{ + int threading = 0, error; + su_clone_r clone; + su_root_t *cloned = NULL; + + if (self == NULL) + return NULL; + + threading = self->sur_threading, self->sur_threading = 0; + error = su_clone_start(self, clone, + (void *)&cloned, su_root_clone_initializer, NULL); + self->sur_threading = threading; + + if (error) + return NULL; + + su_clone_forget(clone); /* destroyed with su_root_destroy() */ + su_root_set_magic(cloned, magic); + return cloned; +} + /**@internal * * Create a reactor object using given message port.

1 0

[commit] r12298 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 12:23:05 2009 New Revision: 12298 Log: Tue Feb 3 10:29:44 CST 2009 Pekka Pessi <first.last(a)nokia.com> * su_alloc: added su_home_parent() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Feb 26 12:23:05 2009 @@ -1 +1 @@ -Wed Feb 25 13:40:08 CST 2009 +Thu Feb 26 12:22:23 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h Thu Feb 26 12:23:05 2009 @@ -101,6 +101,8 @@ SU_DLL int su_home_has_parent(su_home_t const *home); +SU_DLL su_home_t *su_home_parent(su_home_t const *home); + SU_DLL void su_home_check(su_home_t const *home); SU_DLL int su_home_check_alloc(su_home_t const *home, void const *data); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Thu Feb 26 12:23:05 2009 @@ -746,8 +746,21 @@ /** Return true if home is a clone. */ int su_home_has_parent(su_home_t const *home) { - return home && !home->suh_lock && - home->suh_blocks && home->suh_blocks->sub_parent; + return su_home_parent(home) != NULL; +} + +/** Return home's parent home. */ +su_home_t *su_home_parent(su_home_t const *home) +{ + su_home_t *parent = NULL; + + if (home && home->suh_blocks) { + su_block_t *sub = MEMLOCK(home); + parent = sub->sub_parent; + UNLOCK(home); + } + + return parent; } /** Allocate a memory block. @@ -1134,6 +1147,12 @@ for (i = 0; i < n; i++) if (s->sub_nodes[i].sua_data) { su_block_add(d, s->sub_nodes[i].sua_data)[0] = s->sub_nodes[i]; + if (s->sub_nodes[i].sua_home) { + su_home_t *subhome = s->sub_nodes[i].sua_data; + su_block_t *subsub = MEMLOCK(subhome); + subsub->sub_parent = dst; + UNLOCK(subhome); + } } s->sub_used = 0; @@ -1152,8 +1171,21 @@ s = MEMLOCK(src); if (s && s->sub_used) { + n = s->sub_n; + + for (i = 0; i < n; i++) { + if (s->sub_nodes[i].sua_data && s->sub_nodes[i].sua_home) { + su_home_t *subhome = s->sub_nodes[i].sua_data; + su_block_t *subsub = MEMLOCK(subhome); + subsub->sub_parent = dst; + UNLOCK(subhome); + } + } + s->sub_used = 0; memset(s->sub_nodes, 0, s->sub_n * sizeof (s->sub_nodes[0])); + + s->sub_used = 0; } UNLOCK(src); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_alloc.c Thu Feb 26 12:23:05 2009 @@ -192,6 +192,34 @@ TEST(h1->suh_size, 13); } + /* Test su_home_parent() */ + TEST_1(h0 = su_home_new(sizeof *h0)); + TEST_1(h1 = su_home_clone(h0->home, sizeof *h1)); + TEST_1(h2 = su_home_clone(h1->home, sizeof *h2)); + TEST_1(h3 = su_home_clone(h2->home, sizeof *h3)); + + TEST_P(su_home_parent(h0->home), NULL); + TEST_P(su_home_parent(h1->home), h0); + TEST_P(su_home_parent(h2->home), h1); + TEST_P(su_home_parent(h3->home), h2); + TEST(su_home_move(h0->home, h1->home), 0); + TEST_P(su_home_parent(h2->home), h0); + TEST_P(su_home_parent(h3->home), h2); + TEST(su_home_move(h0->home, h2->home), 0); + TEST_P(su_home_parent(h3->home), h0); + + su_home_move(NULL, h0->home); + + TEST_P(su_home_parent(h0->home), NULL); + TEST_P(su_home_parent(h1->home), NULL); + TEST_P(su_home_parent(h2->home), NULL); + TEST_P(su_home_parent(h3->home), NULL); + + su_home_unref(h0->home); + su_home_unref(h1->home); + su_home_unref(h2->home); + su_home_unref(h3->home); + END(); }

1 0

[commit] r12297 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 11:17:35 2009 New Revision: 12297 Log: fix bug that didn't change voice when going menu-top Modified: freeswitch/trunk/src/switch_ivr_menu.c Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Thu Feb 26 11:17:35 2009 @@ -389,7 +389,6 @@ channel = switch_core_session_get_channel(session); - if (!(menu = switch_ivr_menu_find(stack, name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Menu!\n"); switch_goto_status(SWITCH_STATUS_FALSE, end); @@ -443,6 +442,11 @@ char substituted[1024]; char *use_arg = ap->arg; + if(!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) { + switch_channel_set_variable(channel, "tts_engine", menu->tts_engine); + switch_channel_set_variable(channel, "tts_voice", menu->tts_voice); + } + if (ap->re) { switch_regex_t *re = NULL; int ovector[30];

1 0

[commit] r12296 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mrene Date: Thu Feb 26 11:08:41 2009 New Revision: 12296 Log: Add show api [name] and show application [name] Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Feb 26 11:08:41 2009 @@ -2598,7 +2598,11 @@ } else if (!strcasecmp(command, "tasks")) { sprintf(sql, "select * from %s", command); } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); + if (argv[1]) { + sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); + } else { + sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); + } } else if (!strcasecmp(command, "calls")) { sprintf(sql, "select * from calls order by created_epoch"); if (argv[1] && !strcasecmp(argv[1],"count")) {

1 0

[commit] r12295 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: brian Date: Thu Feb 26 10:49:32 2009 New Revision: 12295 Log: clean up ivr_menu a little, prevent recursion Modified: freeswitch/trunk/src/switch_ivr_menu.c Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Thu Feb 26 10:49:32 2009 @@ -57,6 +57,7 @@ struct switch_ivr_menu_action *actions; struct switch_ivr_menu *next; switch_memory_pool_t *pool; + int stack_count; }; struct switch_ivr_menu_action { @@ -207,6 +208,8 @@ switch_set_flag(menu, SWITCH_IVR_MENU_FLAG_STACK); } + menu->buf = switch_core_alloc(menu->pool, 1024); + *new_menu = menu; return SWITCH_STATUS_SUCCESS; @@ -263,15 +266,15 @@ return SWITCH_STATUS_MEMERR; } -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_free(switch_ivr_menu_t * stack) +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_free(switch_ivr_menu_t *stack) { switch_status_t status = SWITCH_STATUS_FALSE; if (stack != NULL && stack->pool != NULL) { if (switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_STACK) && switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_FREEPOOL)) { - switch_memory_pool_t *pool = stack->pool; - status = switch_core_destroy_memory_pool(&pool); + switch_memory_pool_t *pool = stack->pool; + status = switch_core_destroy_memory_pool(&pool); } else { status = SWITCH_STATUS_SUCCESS; } @@ -363,7 +366,7 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *session, switch_ivr_menu_t * stack, char *name, void *obj) +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *session, switch_ivr_menu_t *stack, char *name, void *obj) { int reps = 0, errs = 0, timeouts = 0, match = 0, running = 1; char *greeting_sound = NULL, *aptr = NULL; @@ -373,10 +376,15 @@ switch_ivr_menu_t *menu; switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (++stack->stack_count > 12) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Too many levels of recursion.\n"); + switch_goto_status(SWITCH_STATUS_FALSE, end); + } if (!session || !stack || switch_strlen_zero(name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid menu context\n"); - return SWITCH_STATUS_FALSE; + switch_goto_status(SWITCH_STATUS_FALSE, end); } channel = switch_core_session_get_channel(session); @@ -384,12 +392,7 @@ if (!(menu = switch_ivr_menu_find(stack, name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Menu!\n"); - return SWITCH_STATUS_FALSE; - } - - if (!(menu->buf = malloc(menu->inlen + 1))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Memory!\n"); - return SWITCH_STATUS_FALSE; + switch_goto_status(SWITCH_STATUS_FALSE, end); } if(!switch_strlen_zero(menu->tts_engine) && !switch_strlen_zero(menu->tts_voice)) { @@ -480,8 +483,12 @@ status = switch_ivr_play_file(session, NULL, aptr, NULL); break; case SWITCH_IVR_ACTION_EXECMENU: - reps = -1; - status = switch_ivr_menu_execute(session, stack, aptr, obj); + if (!strcmp(aptr, menu->name)) { + status = SWITCH_STATUS_SUCCESS; + } else { + reps = -1; + status = switch_ivr_menu_execute(session, stack, aptr, obj); + } break; case SWITCH_IVR_ACTION_EXECAPP: { @@ -552,12 +559,16 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exit-sound '%s'\n", menu->exit_sound); - if (!switch_strlen_zero(menu->exit_sound)) { - status = play_and_collect(session, menu, menu->exit_sound, 0); + if (stack->stack_count == 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exit-sound '%s'\n", menu->exit_sound); + if (!switch_strlen_zero(menu->exit_sound)) { + status = play_and_collect(session, menu, menu->exit_sound, 0); + } } - switch_safe_free(menu->buf); + end: + + stack->stack_count--; return status; }

1 0

[commit] r12294 - in freeswitch/trunk: . libs/spandsp/src libs/spandsp/src/msvc libs/spandsp/src/msvc/sys libs/spandsp/src/spandsp libs/spandsp/test-data/etsi/fax libs/spandsp/test-data/itu/fax
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: mikej Date: Thu Feb 26 10:26:25 2009 New Revision: 12294 Log: update to snapshot spandsp-20090226 plus 2 typo fixes Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/msvc/config.h freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h freeswitch/trunk/libs/spandsp/src/spandsp/version.h freeswitch/trunk/libs/spandsp/src/t30.c freeswitch/trunk/libs/spandsp/test-data/etsi/fax/Makefile.am freeswitch/trunk/libs/spandsp/test-data/itu/fax/Makefile.am Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed) Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Thu Feb 26 10:26:25 2009 @@ -16,7 +16,7 @@ ## License along with this program; if not, write to the Free Software ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -## $Id: Makefile.am,v 1.126 2009/02/21 05:39:08 steveu Exp $ +## $Id: Makefile.am,v 1.127 2009/02/25 15:30:21 steveu Exp $ AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) Modified: freeswitch/trunk/libs/spandsp/src/msvc/config.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/config.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/config.h Thu Feb 26 10:26:25 2009 @@ -10,7 +10,7 @@ * * This file is released in the public domain. * - * $Id: config.h,v 1.3 2009/02/10 13:06:47 steveu Exp $ + * $Id: config.h,v 1.4 2009/02/25 15:30:21 steveu Exp $ */ #if !defined(_MSVC_CONFIG_H_) @@ -37,13 +37,10 @@ #define SPANDSP_USE_EXPORT_CAPABILITY 1 - #define PACKAGE "spandsp" #define VERSION "0.0.6" - - -// Win32/DevStudio compatibility stuff +/* Win32/DevStudio compatibility stuff */ #ifdef _MSC_VER @@ -83,5 +80,4 @@ #endif - #endif Modified: freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/inttypes.h Thu Feb 26 10:26:25 2009 @@ -19,7 +19,6 @@ extern "C" { #endif - typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; @@ -28,6 +27,7 @@ typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; + #define INT16_MAX 0x7fff #define INT16_MIN (-INT16_MAX - 1) Modified: freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/spandsp.h Thu Feb 26 10:26:25 2009 @@ -33,14 +33,13 @@ #define __inline__ __inline #pragma warning(disable:4200) - #undef SPANDSP_USE_FIXED_POINT #undef SPANDSP_MISALIGNED_ACCESS_FAILS #define SPANDSP_USE_EXPORT_CAPABILITY 1 #include <stdlib.h> -#include <msvc\inttypes.h> +#include <msvc/inttypes.h> #include <string.h> #include <limits.h> #include <time.h> Modified: freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/sys/time.h Thu Feb 26 10:26:25 2009 @@ -12,9 +12,10 @@ * */ -struct timeval { - long tv_sec; - long tv_usec; -}; +struct timeval +{ + long int tv_sec; + long int tv_usec; +}; extern void gettimeofday(struct timeval *tv, void *tz); Modified: freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h Thu Feb 26 10:26:25 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: bit_operations.h,v 1.24 2009/01/31 08:48:11 steveu Exp $ + * $Id: bit_operations.h,v 1.25 2009/02/24 14:14:03 steveu Exp $ */ /*! \file */ @@ -56,13 +56,48 @@ : [res] "=&r" (res) : [bits] "r" (bits)); return 31 - res; -#elif defined(_M_IX86) // Visual Studio x86 +#elif defined(_M_IX86) + /* Visual Studio i386 */ __asm { xor eax, eax dec eax bsr eax, bits } +#elif defined(_M_X64) + /* Visual Studio x86_64 */ + /* TODO: Need the appropriate x86_64 code */ + int res; + + if (bits == 0) + return -1; + res = 0; + if (bits & 0xFFFF0000) + { + bits &= 0xFFFF0000; + res += 16; + } + if (bits & 0xFF00FF00) + { + bits &= 0xFF00FF00; + res += 8; + } + if (bits & 0xF0F0F0F0) + { + bits &= 0xF0F0F0F0; + res += 4; + } + if (bits & 0xCCCCCCCC) + { + bits &= 0xCCCCCCCC; + res += 2; + } + if (bits & 0xAAAAAAAA) + { + bits &= 0xAAAAAAAA; + res += 1; + } + return res; #else int res; Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h Thu Feb 26 10:26:25 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: fast_convert.h,v 1.4 2009/02/21 05:39:09 steveu Exp $ + * $Id: fast_convert.h,v 1.5 2009/02/24 14:14:03 steveu Exp $ */ #if !defined(_SPANDSP_FAST_CONVERT_H_) @@ -231,7 +231,8 @@ } #endif -#elif (defined(WIN32) || defined(_WIN32)) && !defined(_WIN64) +#elif defined(_M_IX86) + /* Visual Studio i386 */ /* * Win32 doesn't seem to have the lrint() and lrintf() functions. * Therefore implement inline versions of these functions here. @@ -301,28 +302,19 @@ }; return i; } -#elif defined(WIN64) || defined(_WIN64) +#elif defined(_M_X64) + /* Visual Studio x86_64 */ /* x86_64 machines will do best with a simple assignment. */ #include <intrin.h> __inline long int lrint(double x) { -#ifdef _M_X64 return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) ); -#else -#warning "Not Supported: Replacing with a simple C cast." - return (long int) (x); -#endif } __inline long int lrintf(float x) { -#ifdef _M_X64 return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) ); -#else -#warning "Not Supported: Replacing with a simple C cast." - return (long int) (x); -#endif } __inline long int lfastrint(double x) Modified: freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/telephony.h Thu Feb 26 10:26:25 2009 @@ -22,13 +22,13 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: telephony.h,v 1.16 2009/02/03 16:28:41 steveu Exp $ + * $Id: telephony.h,v 1.17 2009/02/25 15:30:21 steveu Exp $ */ #if !defined(_SPANDSP_TELEPHONY_H_) #define _SPANDSP_TELEPHONY_H_ -#if defined(WIN32) +#if defined(_M_IX86) || defined(_M_X64) #if defined(LIBSPANDSP_EXPORTS) #define SPAN_DECLARE(type) __declspec(dllexport) type __stdcall #define SPAN_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/version.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h Thu Feb 26 10:26:25 2009 @@ -30,8 +30,8 @@ /* The date and time of the version are in UTC form. */ -#define SPANDSP_RELEASE_DATE 20090221 -#define SPANDSP_RELEASE_TIME 054406 +#define SPANDSP_RELEASE_DATE 20090226 +#define SPANDSP_RELEASE_TIME 121601 #endif /*- End of file ------------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/t30.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t30.c (original) +++ freeswitch/trunk/libs/spandsp/src/t30.c Thu Feb 26 10:26:25 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t30.c,v 1.286 2009/02/20 12:34:20 steveu Exp $ + * $Id: t30.c,v 1.288 2009/02/26 12:11:51 steveu Exp $ */ /*! \file */ @@ -5353,18 +5353,21 @@ The 2.55s maximum seems to limit signalling frames to no more than 95 octets, including FCS, and flag octets (assuming the use of V.21). */ - if (!ok && s->phase != T30_PHASE_C_ECM_RX) + if (!ok) { span_log(&s->logging, SPAN_LOG_FLOW, "Bad CRC received\n"); - /* We either force a resend, or we wait until a resend occurs through a timeout. */ - if ((s->supported_t30_features & T30_SUPPORT_COMMAND_REPEAT)) + if (s->phase != T30_PHASE_C_ECM_RX) { - s->step = 0; - if (s->phase == T30_PHASE_B_RX) - queue_phase(s, T30_PHASE_B_TX); - else - queue_phase(s, T30_PHASE_D_TX); - send_simple_frame(s, T30_CRP); + /* We either force a resend, or we wait until a resend occurs through a timeout. */ + if ((s->supported_t30_features & T30_SUPPORT_COMMAND_REPEAT)) + { + s->step = 0; + if (s->phase == T30_PHASE_B_RX) + queue_phase(s, T30_PHASE_B_TX); + else + queue_phase(s, T30_PHASE_D_TX); + send_simple_frame(s, T30_CRP); + } } return; } Modified: freeswitch/trunk/libs/spandsp/test-data/etsi/fax/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/test-data/etsi/fax/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/test-data/etsi/fax/Makefile.am Thu Feb 26 10:26:25 2009 @@ -16,7 +16,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -## $Id: Makefile.am,v 1.3 2009/02/20 12:34:20 steveu Exp $ +## $Id: Makefile.am,v 1.4 2009/02/25 17:52:51 steveu Exp $ AM_CFLAGS = $(COMP_VENDOR_CFLAGS) @@ -37,12 +37,16 @@ EXTRA_DIST = +MAINTAINERCLEANFILES = Makefile.in + +LIBDIR = -L$(top_builddir)/src + nobase_data_DATA = ${ETSI_TEST_PAGES} noinst_PROGRAMS = generate_etsi_300_242_pages generate_etsi_300_242_pages_SOURCES = generate_etsi_300_242_pages.c -generate_etsi_300_242_pages_LDADD = -lspandsp -ltiff +generate_etsi_300_242_pages_LDADD = $(LIBDIR) -lspandsp -ltiff clean: rm -f *.tif *.g3 Modified: freeswitch/trunk/libs/spandsp/test-data/itu/fax/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/test-data/itu/fax/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/test-data/itu/fax/Makefile.am Thu Feb 26 10:26:25 2009 @@ -16,7 +16,7 @@ ## License along with this program; if not, write to the Free Software ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -## $Id: Makefile.am,v 1.4 2009/02/20 12:34:20 steveu Exp $ +## $Id: Makefile.am,v 1.5 2009/02/25 17:52:52 steveu Exp $ AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) @@ -97,6 +97,8 @@ EXTRA_DIST = ${ITU_TEST_PAGES_PBM} +MAINTAINERCLEANFILES = Makefile.in + nobase_data_DATA = itutests.tif \ ${ITU_TEST_PAGES} \ dithered.tif \

1 0

[commit] r12293 - freeswitch/trunk/libs/spandsp/src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: robertj Date: Wed Feb 25 20:37:44 2009 New Revision: 12293 Log: Added case significant ignorance Modified: freeswitch/trunk/libs/spandsp/src/ (props changed)

1 0

[commit] r12292 - in freeswitch/trunk: libs/esl/src src
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: anthm Date: Wed Feb 25 18:38:14 2009 New Revision: 12292 Log: missed a spot Modified: freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Wed Feb 25 18:38:14 2009 @@ -147,7 +147,7 @@ { *event = NULL; - if (event_id != ESL_EVENT_CUSTOM && subclass_name) { + if ((event_id > 0 && event_id != ESL_EVENT_CUSTOM) && subclass_name) { return ESL_FAIL; } @@ -157,9 +157,10 @@ memset(*event, 0, sizeof(esl_event_t)); - (*event)->event_id = event_id; - - esl_event_add_header_string(*event, ESL_STACK_BOTTOM, "Event-Name", esl_event_name((*event)->event_id)); + if (event_id) { + (*event)->event_id = event_id; + esl_event_add_header_string(*event, ESL_STACK_BOTTOM, "Event-Name", esl_event_name((*event)->event_id)); + } if (subclass_name) { (*event)->subclass_name = DUP(subclass_name); @@ -389,20 +390,17 @@ ESL_DECLARE(esl_status_t) esl_event_dup(esl_event_t **event, esl_event_t *todup) { - esl_event_header_t *hp, *hp2; + esl_event_header_t *hp; - if (esl_event_create_subclass(event, todup->event_id, todup->subclass_name) != ESL_SUCCESS) { + if (esl_event_create_subclass(event, 0, todup->subclass_name) != ESL_SUCCESS) { return ESL_FAIL; } - if (todup->subclass_name) { - (*event)->subclass_name = DUP(todup->subclass_name); - } + (*event)->event_id = todup->event_id; + (*event)->event_user_data = todup->event_user_data; (*event)->bind_user_data = todup->bind_user_data; - hp2 = (*event)->headers; - for (hp = todup->headers; hp; hp = hp->next) { esl_event_add_header_string(*event, ESL_STACK_BOTTOM, hp->name, hp->value); } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Feb 25 18:38:14 2009 @@ -598,7 +598,7 @@ *event = NULL; - if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) { + if ((event_id > 0 && event_id != SWITCH_EVENT_CUSTOM) && subclass_name) { return SWITCH_STATUS_GENERR; } @@ -611,9 +611,10 @@ memset(*event, 0, sizeof(switch_event_t)); - (*event)->event_id = event_id; - - switch_event_prep_for_delivery_detailed(file, func, line, *event); + if (event_id) { + (*event)->event_id = event_id; + switch_event_prep_for_delivery_detailed(file, func, line, *event); + } if (subclass_name) { (*event)->subclass_name = DUP(subclass_name); @@ -810,20 +811,16 @@ SWITCH_DECLARE(switch_status_t) switch_event_dup(switch_event_t **event, switch_event_t *todup) { - switch_event_header_t *hp, *hp2; + switch_event_header_t *hp; - if (switch_event_create_subclass(event, todup->event_id, todup->subclass_name) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create_subclass(event, 0, todup->subclass_name) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; } - if (todup->subclass_name) { - (*event)->subclass_name = DUP(todup->subclass_name); - } + (*event)->event_id = todup->event_id; (*event)->event_user_data = todup->event_user_data; (*event)->bind_user_data = todup->bind_user_data; - hp2 = (*event)->headers; - for (hp = todup->headers; hp; hp = hp->next) { switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, hp->name, hp->value); }

1 0

[commit] r12291 - in freeswitch/trunk: libs/esl/src src src/mod/asr_tts/mod_flite src/mod/endpoints/mod_opal
by FreeSWITCH SVN 26 Feb '09

26 Feb '09

Author: anthm Date: Wed Feb 25 18:14:03 2009 New Revision: 12291 Log: mighty putty for a big leak Modified: freeswitch/trunk/libs/esl/src/esl_event.c freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Wed Feb 25 18:14:03 2009 @@ -389,7 +389,7 @@ ESL_DECLARE(esl_status_t) esl_event_dup(esl_event_t **event, esl_event_t *todup) { - esl_event_header_t *header, *hp, *hp2, *last = NULL; + esl_event_header_t *hp, *hp2; if (esl_event_create_subclass(event, todup->event_id, todup->subclass_name) != ESL_SUCCESS) { return ESL_FAIL; @@ -404,21 +404,7 @@ hp2 = (*event)->headers; for (hp = todup->headers; hp; hp = hp->next) { - header = ALLOC(sizeof(*header)); - esl_assert(header); - - memset(header, 0, sizeof(*header)); - - header->name = DUP(hp->name); - header->value = DUP(hp->value); - - if (last) { - last->next = header; - } else { - (*event)->headers = header; - } - - (*event)->last_header = last = header; + esl_event_add_header_string(*event, ESL_STACK_BOTTOM, hp->name, hp->value); } if (todup->body) { 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 Wed Feb 25 18:14:03 2009 @@ -5,7 +5,7 @@ $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \ $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \ $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \ - $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm + $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm -lasound LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include LOCAL_LIBADD=$(FLITE_A) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Feb 25 18:14:03 2009 @@ -446,6 +446,8 @@ } } + switch_event_destroy(&params); + if (xml) switch_xml_free(xml); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Feb 25 18:14:03 2009 @@ -810,7 +810,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_dup(switch_event_t **event, switch_event_t *todup) { - switch_event_header_t *header, *hp, *hp2, *last = NULL; + switch_event_header_t *hp, *hp2; if (switch_event_create_subclass(event, todup->event_id, todup->subclass_name) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; @@ -825,27 +825,7 @@ hp2 = (*event)->headers; for (hp = todup->headers; hp; hp = hp->next) { - void *pop; - - if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { - header = (switch_event_header_t *) pop; - } else { - header = ALLOC(sizeof(*header)); - switch_assert(header); - } - - memset(header, 0, sizeof(*header)); - - header->name = DUP(hp->name); - header->value = DUP(hp->value); - - if (last) { - last->next = header; - } else { - (*event)->headers = header; - } - - (*event)->last_header = last = header; + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, hp->name, hp->value); } if (todup->body) {

1 0

[commit] r12290 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Feb '09

25 Feb '09

Author: brian Date: Wed Feb 25 17:07:45 2009 New Revision: 12290 Log: Some little birdie said "what if we could add params to the contact that isn't a gateway?" SO IT SHALL BE! /b Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Wed Feb 25 17:07:45 2009 @@ -1168,6 +1168,7 @@ const char *screen = "no"; const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); const char *invite_to_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_to_params"); + const char *invite_contact_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_contact_params"); const char *invite_from_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_from_params"); const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri"); @@ -1256,7 +1257,7 @@ } url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); - invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); + invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, invite_contact_params); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, invite_from_params); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params ? invite_to_params : invite_params);

1 0