March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4759 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 24 Mar '07

24 Mar '07

Author: mikej Date: Fri Mar 23 23:32:24 2007 New Revision: 4759 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: CR/LF -> LF Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Fri Mar 23 23:32:24 2007 @@ -36,19 +36,19 @@ static int COLORIZE = 0; #ifdef WIN32 static HANDLE hStdout; -static WORD wOldColorAttrs; -static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; -static WORD COLORS[] = - { FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY }; -#else +static WORD wOldColorAttrs; +static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; +static WORD COLORS[] = + { FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_RED | FOREGROUND_INTENSITY, + FOREGROUND_BLUE | FOREGROUND_INTENSITY, + FOREGROUND_BLUE | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY, + FOREGROUND_GREEN | FOREGROUND_INTENSITY }; +#else static const char *COLORS[] = { SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" }; #endif @@ -170,7 +170,7 @@ if (COLORIZE) { #ifdef WIN32 SetConsoleTextAttribute(hStdout, COLORS[node->level]); - WriteFile(hStdout, node->data, (DWORD)strlen(node->data), NULL, NULL); + WriteFile(hStdout, node->data, (DWORD)strlen(node->data), NULL, NULL); SetConsoleTextAttribute(hStdout, wOldColorAttrs); #else fprintf(handle, "%s%s%s", COLORS[node->level], node->data, SWITCH_SEQ_DEFAULT_COLOR);

1 0

[commit] r4758 - in freeswitch/trunk: . src/include w32/Library
by Freeswitch SVN 24 Mar '07

24 Mar '07

Author: mikej Date: Fri Mar 23 23:29:24 2007 New Revision: 4758 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: switch_config isn't used anymore. leaving the .c and .h file there for now, we may remove them in the future. Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 23 23:29:24 2007 @@ -25,7 +25,6 @@ src/switch_buffer.c \ src/switch_caller.c \ src/switch_channel.c \ -src/switch_config.c \ src/switch_console.c \ src/switch_core.c \ src/switch_core_db.c\ @@ -52,7 +51,6 @@ src/include/switch_buffer.h\ src/include/switch_caller.h\ src/include/switch_channel.h\ -src/include/switch_config.h\ src/include/switch_console.h\ src/include/switch_core.h\ src/include/switch_core_db.h\ Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri Mar 23 23:29:24 2007 @@ -79,7 +79,6 @@ #include <switch_console.h> #include <switch_utils.h> #include <switch_caller.h> -#include <switch_config.h> #include <switch_frame.h> #include <switch_module_interfaces.h> #include <switch_channel.h> Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Fri Mar 23 23:29:24 2007 @@ -60,6 +60,8 @@ SWITCH_BEGIN_EXTERN_C +typedef struct switch_config switch_config_t; + /*! \brief A simple file handle representing an open configuration file **/ struct switch_config { /*! FILE stream buffer to the opened file */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Mar 23 23:29:24 2007 @@ -969,7 +969,6 @@ typedef struct switch_codec_implementation switch_codec_implementation_t; typedef struct switch_buffer switch_buffer_t; typedef struct switch_codec_settings switch_codec_settings_t; -typedef struct switch_config switch_config_t; typedef struct switch_io_event_hook_outgoing_channel switch_io_event_hook_outgoing_channel_t; typedef struct switch_io_event_hook_answer_channel switch_io_event_hook_answer_channel_t; Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri Mar 23 23:29:24 2007 @@ -240,10 +240,6 @@ > </File> <File - RelativePath="..\..\src\switch_config.c" - > - </File> - <File RelativePath="..\..\src\switch_console.c" > </File> @@ -322,10 +318,6 @@ > </File> <File - RelativePath="..\..\src\include\switch_config.h" - > - </File> - <File RelativePath="..\..\src\include\switch_console.h" > </File>

1 0

[commit] r4757 - freeswitch/trunk/src/include
by Freeswitch SVN 24 Mar '07

24 Mar '07

Author: mikej Date: Fri Mar 23 23:14:24 2007 New Revision: 4757 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_types.h Log: add _COUNT memeber at the end of most enum defs (except for those with specific vals like the flags. These should be very handy for bounds checking later on. Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri Mar 23 23:14:24 2007 @@ -509,6 +509,8 @@ SWITCH_IVR_ACTION_TOMAIN, /* Go back to the top level menu. */ SWITCH_IVR_ACTION_TRANSFER, /* Transfer caller to another ext. */ SWITCH_IVR_ACTION_NOOP, /* No operation */ + + SWITCH_IVR_ACTION_COUNT } switch_ivr_action_t; struct switch_ivr_menu; typedef switch_ivr_action_t switch_ivr_menu_action_function_t(struct switch_ivr_menu *, char *, char *, size_t, void *); Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Mar 23 23:14:24 2007 @@ -137,7 +137,9 @@ SSM_NA, SSM_PRONOUNCED, SSM_ITERATED, - SSM_COUNTED + SSM_COUNTED, + + SSM_COUNT } switch_say_method_t; typedef enum { @@ -159,12 +161,16 @@ SST_ACCOUNT_NUMBER, SST_NAME_SPELLED, SST_NAME_PHONETIC, + + SST_COUNT } switch_say_type_t; typedef enum { SMA_NONE, SMA_GET, - SMA_SET + SMA_SET, + + SMA_COUNT } switch_management_action_t; typedef enum { @@ -186,6 +192,8 @@ SWITCH_ABC_TYPE_WRITE, SWITCH_ABC_TYPE_WRITE_REPLACE, SWITCH_ABC_TYPE_CLOSE, + + SWITCH_ABC_TYPE_COUNT } switch_abc_type_t; typedef struct { @@ -241,7 +249,7 @@ SWITCH_AUDIO_COL_STR_SOFTWARE = 0x03, SWITCH_AUDIO_COL_STR_ARTIST = 0x04, SWITCH_AUDIO_COL_STR_COMMENT = 0x05, - SWITCH_AUDIO_COL_STR_DATE = 0x06 + SWITCH_AUDIO_COL_STR_DATE = 0x06, } switch_audio_col_t; typedef enum { @@ -323,6 +331,8 @@ SWITCH_PRIORITY_NORMAL, SWITCH_PRIORITY_LOW, SWITCH_PRIORITY_HIGH, + + SWITCH_PRIORITY_COUNT } switch_priority_t; /*! @@ -369,7 +379,9 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA, SWITCH_MESSAGE_INDICATE_HOLD, SWITCH_MESSAGE_INDICATE_UNHOLD, - SWITCH_MESSAGE_INDICATE_REDIRECT + SWITCH_MESSAGE_INDICATE_REDIRECT, + + SWITCH_MESSAGE_INDICATE_COUNT } switch_core_session_message_types_t; @@ -424,7 +436,9 @@ SWITCH_STATUS_SOCKERR, SWITCH_STATUS_MORE_DATA, SWITCH_STATUS_NOTFOUND, - SWITCH_STATUS_UNLOAD + SWITCH_STATUS_UNLOAD, + + SWITCH_STATUS_COUNT } switch_status_t; @@ -469,7 +483,9 @@ typedef enum { SWITCH_CHANNEL_ID_LOG, SWITCH_CHANNEL_ID_LOG_CLEAN, - SWITCH_CHANNEL_ID_EVENT + SWITCH_CHANNEL_ID_EVENT, + + SWITCH_CHANNEL_ID_COUNT } switch_text_channel_t; typedef enum { @@ -506,7 +522,9 @@ CS_HOLD, CS_HIBERNATE, CS_HANGUP, - CS_DONE + CS_DONE, + + CS_COUNT } switch_channel_state_t; @@ -594,7 +612,9 @@ SWITCH_SIG_NONE, SWITCH_SIG_KILL, SWITCH_SIG_XFER, - SWITCH_SIG_BREAK + SWITCH_SIG_BREAK, + + SWITCH_SIG_COUNT } switch_signal_t; /*! @@ -690,7 +710,9 @@ SWITCH_CODEC_TYPE_AUDIO, SWITCH_CODEC_TYPE_VIDEO, SWITCH_CODEC_TYPE_T38, - SWITCH_CODEC_TYPE_APP + SWITCH_CODEC_TYPE_APP, + + SWITCH_CODEC_TYPE_COUNT } switch_codec_type_t; @@ -850,7 +872,9 @@ typedef enum { SWITCH_INPUT_TYPE_DTMF, - SWITCH_INPUT_TYPE_EVENT + SWITCH_INPUT_TYPE_EVENT, + + SWITCH_INPUT_TYPE_COUNT } switch_input_type_t; typedef enum { @@ -917,7 +941,9 @@ SCSC_PAUSE_INBOUND, SCSC_HUPALL, SCSC_SHUTDOWN, - SCSC_CHECK_RUNNING + SCSC_CHECK_RUNNING, + + SCSC_COUNT } switch_session_ctl_t; typedef uint16_t switch_port_t;

1 0

[commit] r4756 - freeswitch/trunk/src
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Fri Mar 23 18:44:28 2007 New Revision: 4756 Modified: freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_console.c Log: a little realloc never hurt anyone. Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Fri Mar 23 18:44:28 2007 @@ -657,8 +657,31 @@ #ifdef HAVE_VASPRINTF return vasprintf(buf, format, ap); #else - *buf = (char *) malloc(2048); - return vsnprintf(*buf, 2048, format, ap); + size_t block_size = 1024; + int ret = -1; + int count = 1; + *buf = (char *) malloc(block_size); + + if (*buf == NULL) { + return -1; + } + + while (ret == -1 && count < 10) { + ret = vsnprintf(*buf, block_size*count, format, ap); + if (ret == -1) { + void *new_buf; + count++; + new_buf = realloc(*buf, block_size*count); + if (new_buf == NULL) { + *buf = NULL; + return -1; + } else { + *buf = new_buf; + } + } + } + return ret; + #endif } Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Fri Mar 23 18:44:28 2007 @@ -41,7 +41,7 @@ char *buf = handle->data; char *end = handle->end; int ret = 0; - char *data; + char *data = NULL; if (handle->data_len >= handle->data_size) { return SWITCH_STATUS_FALSE;

1 0

[commit] r4755 - in freeswitch/trunk: libs/apr-util/xml/expat/lib src w32/Library
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Fri Mar 23 17:54:16 2007 New Revision: 4755 Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h freeswitch/trunk/src/switch_resample.c freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix windows build. you may need to delete libs/apr-util/xml/expat/lib/config.h for it to build. Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/lib/winconfig.h Fri Mar 23 17:54:16 2007 @@ -23,5 +23,6 @@ #define XML_DTD 1 #define XML_BYTE_ORDER 12 #define XML_CONTEXT_BYTES 1024 +#define HAVE_MEMMOVE #endif /* ndef WINCONFIG_H */ Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Fri Mar 23 17:54:16 2007 @@ -185,8 +185,9 @@ SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) { - int16_t rnd, x,i; - uint32_t sum_rnd = 0; + int16_t rnd, x; + uint32_t i; + int sum_rnd = 0; assert(divisor); @@ -196,8 +197,7 @@ sum_rnd += rnd; } switch_normalize_to_16bit(sum_rnd); - *data = (int16_t) sum_rnd; - *data /= (int)divisor; + *data = (int16_t)((int16_t)sum_rnd / (int)divisor); data++; } Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri Mar 23 17:54:16 2007 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -136,7 +136,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2"

1 0

[commit] r4754 - in freeswitch/trunk: . src/mod/endpoints/mod_wanpipe src/mod/languages/mod_spidermonkey_teletone
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Fri Mar 23 16:41:16 2007 New Revision: 4754 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Log: start building teletone as part of the core Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 23 16:41:16 2007 @@ -38,7 +38,10 @@ src/switch_ivr.c \ src/switch_stun.c\ src/switch_log.c\ -src/switch_xml.c +src/switch_xml.c\ +libs/libteletone/src/libteletone_detect.c\ +libs/libteletone/src/libteletone_generate.c + library_includedir = $(PREFIX)/include @@ -66,7 +69,12 @@ src/include/switch_rtp.h\ src/include/switch_stun.h\ src/include/switch_log.h\ -src/include/switch_xml.h +src/include/switch_xml.h\ +libs/libteletone/src/libteletone_detect.h\ +libs/libteletone/src/libteletone_generate.h\ +libs/libteletone/src/libteletone.h + + CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` CORE_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` @@ -80,7 +88,6 @@ CORE_LIBS = libs/apr/libapr-1.la libs/apr-util/libaprutil-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la CORE_LIBS += libs/srtp/libsrtp.la libs/libresample/libresample.la -CORE_LIBS += libs/libteletone/libteletone.la lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) @@ -166,10 +173,6 @@ @cd libs/srtp && $(MAKE) @$(TOUCH_TARGET) -libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update - @cd libs/libteletone && $(MAKE) - @$(TOUCH_TARGET) - libs/libresample/libresample.la: libs/libresample libs/libresample/.update @cd libs/libresample && $(MAKE) @$(TOUCH_TARGET) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Mar 23 16:41:16 2007 @@ -313,7 +313,6 @@ AC_CONFIG_SUBDIRS(libs/srtp) AC_CONFIG_SUBDIRS(libs/sqlite) AC_CONFIG_SUBDIRS(libs/libresample) -AC_CONFIG_SUBDIRS(libs/libteletone) AC_CONFIG_SUBDIRS(libs/pcre) AC_CONFIG_SUBDIRS(libs/apr) AC_CONFIG_SUBDIRS(libs/apr-util) Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Fri Mar 23 16:41:16 2007 @@ -11,14 +11,10 @@ WANPIPE_KO=$(WANPIPE_DIR)/patches/kdrivers/src/net/wanpipe.ko WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko") LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma -TELETONE_DIR=$(BASE)/libs/libteletone -TELETONE_LA=$(TELETONE_DIR)/libteletone.la LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API -LOCAL_LIBADD = $(TELETONE_LA) LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o - include $(BASE)/build/modmake.rules $(LIBPRI_DIR): @@ -31,10 +27,6 @@ cd $(WANPIPE_DIR) && $(MAKE) @$(TOUCH_TARGET) -$(TELETONE_LA): - cd $(TELETONE_DIR) && $(MAKE) - @$(TOUCH_TARGET) - $(WANPIPE_INSTALLED_KO): $(WANPIPE_KO) cd $(WANPIPE_DIR) && $(MAKE) install Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Fri Mar 23 16:41:16 2007 @@ -1,5 +1,4 @@ switch_srcdir=../../../.. LOCAL_CFLAGS=-I$(switch_srcdir)/libs/libteletone/src -LOCAL_LIBADD=$(switch_srcdir)/libs/libteletone/libteletone.la include ../mod_spidermonkey/sm.mak

1 0

[commit] r4753 - freeswitch/trunk/libs/xmlrpc-c
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Fri Mar 23 14:38:55 2007 New Revision: 4753 Modified: freeswitch/trunk/libs/xmlrpc-c/configure.gnu Log: don't build curl client, we don't need it Modified: freeswitch/trunk/libs/xmlrpc-c/configure.gnu ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/configure.gnu (original) +++ freeswitch/trunk/libs/xmlrpc-c/configure.gnu Fri Mar 23 14:38:55 2007 @@ -1,2 +1,2 @@ #! /bin/sh -./configure "$@" --disable-cplusplus --disable-wininet-client --disable-libwww-client --disable-shared --with-pic +./configure "$@" --disable-cplusplus --disable-wininet-client --disable-libwww-client --disable-shared --with-pic --disable-curl-client

1 0

[commit] r4751 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: anthm Date: Fri Mar 23 12:34:13 2007 New Revision: 4751 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fixes 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 Fri Mar 23 12:34:13 2007 @@ -735,7 +735,7 @@ if (conference->fnode->leadin) { conference->fnode->leadin--; } else { - ready++; + file_sample_len = samples; if (conference->fnode->type == NODE_TYPE_SPEECH) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; uint32_t rate = conference->rate; @@ -758,34 +758,40 @@ } } has_file_data = 1; + ready++; } else { has_file_data = 0; } if (conference->async_fnode) { - switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); - - if (file_sample_len <= 0) { - conference->async_fnode->done++; + /* Lead in time */ + if (conference->async_fnode->leadin) { + conference->async_fnode->leadin--; } else { - if (has_file_data) { - switch_size_t x; - for (x = 0; x < file_sample_len; x++) { - int32_t z; - int16_t *bptr, *muxed; - - muxed = (int16_t *) file_frame; - bptr = (int16_t *) async_file_frame; - z = muxed[x] + bptr[x]; - switch_normalize_to_16bit(z); - muxed[x] = (int16_t)z; - } + file_sample_len = samples; + switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); + if (file_sample_len <= 0) { + conference->async_fnode->done++; } else { - memcpy(file_frame, async_file_frame, file_sample_len * 2); - has_file_data = 1; + if (has_file_data) { + switch_size_t x; + for (x = 0; x < file_sample_len; x++) { + int32_t z; + int16_t *bptr, *muxed; + + muxed = (int16_t *) file_frame; + bptr = (int16_t *) async_file_frame; + z = muxed[x] + bptr[x]; + switch_normalize_to_16bit(z); + muxed[x] = (int16_t)z; + } + } else { + memcpy(file_frame, async_file_frame, file_sample_len * 2); + has_file_data = 1; + ready++; + } } } - } if (ready) { @@ -833,22 +839,22 @@ if (imember->read > imember->len) { imember->len = imember->read; } - + bptr = (int16_t *) imember->frame; muxed = (int16_t *) omember->mux_frame; - + for (x = 0; x < imember->read / 2; x++) { int32_t z = muxed[x] + bptr[x]; switch_normalize_to_16bit(z); muxed[x] = (int16_t)z; } - + ready++; } } } - + /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */ for (imember = conference->members; imember; imember = imember->next) { if (switch_test_flag(imember, MFLAG_RUNNING)) { @@ -1958,7 +1964,7 @@ } } - if (!strncasecmp(file, "say:", 4)) { + if (!async && !strncasecmp(file, "say:", 4)) { status = conference_say(conference, file + 4, leadin); goto done; } @@ -1969,10 +1975,12 @@ goto done; } file = dfile; - } else { + } else if (!async) { status = conference_say(conference, file, leadin); goto done; - } + } else { + goto done; + } } /* Setup a memory pool to use. */ @@ -2017,8 +2025,10 @@ conference->async_fnode = fnode; if (nptr) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&conference->fnode->sh, &flags); + switch_memory_pool_t *pool; + switch_core_file_close(&nptr->fh); + pool = nptr->pool; + switch_core_destroy_memory_pool(&pool); } } else {

1 0

[commit] r4750 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: anthm Date: Fri Mar 23 11:53:46 2007 New Revision: 4750 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: o crap Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Fri Mar 23 11:53:46 2007 @@ -3,7 +3,7 @@ #XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la #dont ask... -XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la +XMLRPCLAS = $(XMLRPC_DIR)/src/*.o XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.la

1 0

[commit] r4749 - in freeswitch/trunk: . build/config src/mod/event_handlers/mod_cdr
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Fri Mar 23 02:08:17 2007 New Revision: 4749 Added: freeswitch/trunk/build/config/ax_lib_mysql.m4 freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am Removed: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Modified: freeswitch/trunk/acinclude.m4 freeswitch/trunk/configure.in Log: add proper autoconf checks for mysql client and convert mod_cdr to automake makefile so that we can use AM_CONDITIONALS for the mysqlcdr build selection Modified: freeswitch/trunk/acinclude.m4 ============================================================================== --- freeswitch/trunk/acinclude.m4 (original) +++ freeswitch/trunk/acinclude.m4 Fri Mar 23 02:08:17 2007 @@ -4,5 +4,6 @@ m4_include([build/config/ax_check_compiler_flags.m4]) m4_include([build/config/ac_gcc_archflag.m4]) m4_include([build/config/ac_gcc_x86_cpuid.m4]) +m4_include([build/config/ax_lib_mysql.m4]) m4_include([libs/apr/build/apr_common.m4]) m4_include([libs/curl/docs/libcurl/libcurl.m4]) Added: freeswitch/trunk/build/config/ax_lib_mysql.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/build/config/ax_lib_mysql.m4 Fri Mar 23 02:08:17 2007 @@ -0,0 +1,148 @@ +##### http://autoconf-archive.cryp.to/ax_lib_mysql.html +# +# SYNOPSIS +# +# AX_LIB_MYSQL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of MySQL client library +# of particular version or newer. +# +# AX_LIB_MYSQL macro takes only one argument which is optional. If +# there is no required version passed, then macro does not run +# version test. +# +# The --with-mysql option takes one of three possible values: +# +# no - do not check for MySQL client library +# +# yes - do check for MySQL library in standard locations +# (mysql_config should be in the PATH) +# +# path - complete path to mysql_config utility, use this option if +# mysql_config can't be found in the PATH +# +# This macro calls: +# +# AC_SUBST(MYSQL_CFLAGS) +# AC_SUBST(MYSQL_LDFLAGS) +# AC_SUBST(MYSQL_VERSION) +# +# And sets: +# +# HAVE_MYSQL +# +# LAST MODIFICATION +# +# 2006-07-16 +# +# COPYLEFT +# +# Copyright (c) 2006 Mateusz Loskot <mateusz(a)loskot.net> +# +# Copying and distribution of this file, with or without +# modification, are permitted in any medium without royalty provided +# the copyright notice and this notice are preserved. + +AC_DEFUN([AX_LIB_MYSQL], +[ + AC_ARG_WITH([mysql], + AC_HELP_STRING([--with-mysql=@<:@ARG@:>@], + [use MySQL client library @<:@default=yes@:>@, optionally specify path to mysql_config] + ), + [ + if test "$withval" = "no"; then + want_mysql="no" + elif test "$withval" = "yes"; then + want_mysql="yes" + else + want_mysql="yes" + MYSQL_CONFIG="$withval" + fi + ], + [want_mysql="yes"] + ) + + MYSQL_CFLAGS="" + MYSQL_LDFLAGS="" + MYSQL_VERSION="" + + dnl + dnl Check MySQL libraries (libpq) + dnl + + if test "$want_mysql" = "yes"; then + + if test -z "$MYSQL_CONFIG" -o test; then + AC_PATH_PROG([MYSQL_CONFIG], [mysql_config], [no]) + fi + + if test "$MYSQL_CONFIG" != "no"; then + AC_MSG_CHECKING([for MySQL libraries]) + + MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" + MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" + + MYSQL_VERSION=`$MYSQL_CONFIG --version` + + AC_DEFINE([HAVE_MYSQL], [1], + [Define to 1 if MySQL libraries are available]) + + found_mysql="yes" + AC_MSG_RESULT([yes]) + else + found_mysql="no" + AC_MSG_RESULT([no]) + fi + fi + + dnl + dnl Check if required version of MySQL is available + dnl + + + mysql_version_req=ifelse([$1], [], [], [$1]) + + if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then + + AC_MSG_CHECKING([if MySQL version is >= $mysql_version_req]) + + dnl Decompose required version string of MySQL + dnl and calculate its number representation + mysql_version_req_major=`expr $mysql_version_req : '$[[0-9]]*$'` + mysql_version_req_minor=`expr $mysql_version_req : '[[0-9]]*\.$[[0-9]]*$'` + mysql_version_req_micro=`expr $mysql_version_req : '[[0-9]]*\.[[0-9]]*\.$[[0-9]]*$'` + if test "x$mysql_version_req_micro" = "x"; then + mysql_version_req_micro="0" + fi + + mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \ + \+ $mysql_version_req_minor \* 1000 \ + \+ $mysql_version_req_micro` + + dnl Decompose version string of installed MySQL + dnl and calculate its number representation + mysql_version_major=`expr $MYSQL_VERSION : '$[[0-9]]*$'` + mysql_version_minor=`expr $MYSQL_VERSION : '[[0-9]]*\.$[[0-9]]*$'` + mysql_version_micro=`expr $MYSQL_VERSION : '[[0-9]]*\.[[0-9]]*\.$[[0-9]]*$'` + if test "x$mysql_version_micro" = "x"; then + mysql_version_micro="0" + fi + + mysql_version_number=`expr $mysql_version_major \* 1000000 \ + \+ $mysql_version_minor \* 1000 \ + \+ $mysql_version_micro` + + mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number` + if test "$mysql_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi + + AC_SUBST([MYSQL_VERSION]) + AC_SUBST([MYSQL_CFLAGS]) + AC_SUBST([MYSQL_LDFLAGS]) +]) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Mar 23 02:08:17 2007 @@ -291,11 +291,16 @@ AC_ARG_ENABLE(crash-protection, [ --enable-crash-protection Compile with CRASH Protection],,[enable_crash_prot="no"]) +#AX_LIB_MYSQL([MINIMUM-VERSION]) +AX_LIB_MYSQL + AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) +AM_CONDITIONAL([HAVE_MYSQL],[test "$have_mysql" = "yes"]) AC_CONFIG_FILES([Makefile src/Makefile src/mod/Makefile + src/mod/event_handlers/mod_cdr/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules]) Added: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am Fri Mar 23 02:08:17 2007 @@ -0,0 +1,49 @@ +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL=`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +LINK_OUTPUT_REDIR=> $(MODNAME).log || error="yes" ; \ + if test -n "$(VERBOSE)" -o "$$error" = "yes"; then \ + cat $(MODNAME).log ; \ + fi ;\ + if test "$$error" = "yes"; then \ + exit 1 ;\ + fi + +moddir=$(prefix)/mod + + + +MODNAME=mod_cdr +mod_LTLIBRARIES = mod_cdr.la +mod_cdr_la_SOURCES = mod_cdr.cpp cdrcontainer.cpp basecdr.cpp baseregistry.cpp pddcdr.cpp csvcdr.cpp xmlcdr.cpp sqlitecdr.cpp +mod_cdr_la_CFLAGS = $(AM_CFLAGS) +mod_cdr_la_LIBADD=$(switch_builddir)/libfreeswitch.la +mod_cdr_la_LDFLAGS=-module -avoid-version -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) + +#Build mysqlcdr if we have mysql client +if HAVE_MYSQL +mod_cdr_la_CFLAGS += -DMYSQL +mod_cdr_la_LDFLAGS += -lmysql-client +mod_cdr_la_SOURCES += mysqlcdr.cpp +endif + +#mod_cdr_la_CFLAGS += -DSWITCH_QUEUE_ENHANCED +#mod_cdr_la_LDFLAGS += -lcurl + +#Override link target so we can control the output + +$(MODNAME).la: $(mod_cdr_la_OBJECTS) $(mod_cdr_la_DEPENDENCIES) + @echo Creating $(MODNAME).$(DYNAMIC_LIB_EXTEN)... + @$(CXXLINK) -rpath $(moddir) $(mod_cdr_la_LDFLAGS) $(mod_cdr_la_OBJECTS) $(mod_cdr_la_LIBADD) $(LIBS) $(LINK_OUTPUT_REDIR) + +#Override the linstall target so we just install the .so/.dylib + +install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + +$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la + @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) + @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ + $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + else \ + $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + fi

1 0