- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

24 Mar '07

Author: mikej Date: Sat Mar 24 15:33:34 2007 New Revision: 4762 Modified: freeswitch/trunk/src/switch_apr.c Log: a more proper replacement for vasprintf. Lets see if we can actually do it this way (seems to work on msvc which is the only platform I have seen that does not have vasprintf available). Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Sat Mar 24 15:33:34 2007 @@ -608,79 +608,28 @@ return apr_queue_trypush(queue, data); } -#if 0 -/* Utility functions */ -struct switch_vasprintf_data { - apr_vformatter_buff_t vbuff; - switch_size_t len; - switch_size_t block_size; - char *buf; -}; - -static int vasprintf_flush(apr_vformatter_buff_t *buff) +SWITCH_DECLARE(int) switch_vasprintf(char **ret, const char *fmt, va_list ap) { - struct switch_vasprintf_data *data = (struct switch_vasprintf_data *)buff; - - char *temp; - switch_size_t len = data->vbuff.curpos - data->buf; - - if ((temp = realloc(data->buf, data->len + data->block_size))) { - data->buf = temp; - data->vbuff.curpos = data->buf + len; - data->len = data->len + data->block_size; - data->vbuff.endpos = data->buf + data->len; - return 0; - } - - return -1; -} -#endif - -SWITCH_DECLARE(int) switch_vasprintf(char **buf, const char *format, va_list ap) -{ -#if 0 - struct switch_vasprintf_data data; - - data.block_size = 1024; - data.buf = malloc(data.block_size); - - if (data.buf == NULL) { - *buf = NULL; - return 0; - } - - data.vbuff.curpos = data.buf; - data.vbuff.endpos = data.buf + data.block_size; - - return apr_vformatter(vasprintf_flush, (apr_vformatter_buff_t *)&data, format, ap); -#endif #ifdef HAVE_VASPRINTF - return vasprintf(buf, format, ap); + return vasprintf(ret, fmt, ap); #else - size_t block_size = 1024; - int ret = -1; - int count = 1; - *buf = (char *) malloc(block_size); + char *buf; + int len; + size_t buflen; - 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; - } + len = vsnprintf(NULL, 0, fmt, ap); + if (len > 0) { + buflen = (size_t)(len + 1); + if ((buf = malloc(buflen)) == NULL) { + *ret = NULL; + return -1; } + len = vsnprintf(buf, buflen, fmt, ap); + *ret = buf; + } else { + *ret = NULL; } - return ret; + return len; #endif }

1 0

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

24 Mar '07

Author: mikej Date: Sat Mar 24 00:52:46 2007 New Revision: 4761 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_types.h Log: roll back 4757 until I figure out how I want to actually handle those. Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Sat Mar 24 00:52:46 2007 @@ -509,8 +509,6 @@ 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 Sat Mar 24 00:52:46 2007 @@ -137,9 +137,7 @@ SSM_NA, SSM_PRONOUNCED, SSM_ITERATED, - SSM_COUNTED, - - SSM_COUNT + SSM_COUNTED } switch_say_method_t; typedef enum { @@ -161,16 +159,12 @@ SST_ACCOUNT_NUMBER, SST_NAME_SPELLED, SST_NAME_PHONETIC, - - SST_COUNT } switch_say_type_t; typedef enum { SMA_NONE, SMA_GET, - SMA_SET, - - SMA_COUNT + SMA_SET } switch_management_action_t; typedef enum { @@ -192,8 +186,6 @@ SWITCH_ABC_TYPE_WRITE, SWITCH_ABC_TYPE_WRITE_REPLACE, SWITCH_ABC_TYPE_CLOSE, - - SWITCH_ABC_TYPE_COUNT } switch_abc_type_t; typedef struct { @@ -249,7 +241,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 { @@ -331,8 +323,6 @@ SWITCH_PRIORITY_NORMAL, SWITCH_PRIORITY_LOW, SWITCH_PRIORITY_HIGH, - - SWITCH_PRIORITY_COUNT } switch_priority_t; /*! @@ -379,9 +369,7 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA, SWITCH_MESSAGE_INDICATE_HOLD, SWITCH_MESSAGE_INDICATE_UNHOLD, - SWITCH_MESSAGE_INDICATE_REDIRECT, - - SWITCH_MESSAGE_INDICATE_COUNT + SWITCH_MESSAGE_INDICATE_REDIRECT } switch_core_session_message_types_t; @@ -436,9 +424,7 @@ SWITCH_STATUS_SOCKERR, SWITCH_STATUS_MORE_DATA, SWITCH_STATUS_NOTFOUND, - SWITCH_STATUS_UNLOAD, - - SWITCH_STATUS_COUNT + SWITCH_STATUS_UNLOAD } switch_status_t; @@ -483,9 +469,7 @@ typedef enum { SWITCH_CHANNEL_ID_LOG, SWITCH_CHANNEL_ID_LOG_CLEAN, - SWITCH_CHANNEL_ID_EVENT, - - SWITCH_CHANNEL_ID_COUNT + SWITCH_CHANNEL_ID_EVENT } switch_text_channel_t; typedef enum { @@ -522,9 +506,7 @@ CS_HOLD, CS_HIBERNATE, CS_HANGUP, - CS_DONE, - - CS_COUNT + CS_DONE } switch_channel_state_t; @@ -612,9 +594,7 @@ SWITCH_SIG_NONE, SWITCH_SIG_KILL, SWITCH_SIG_XFER, - SWITCH_SIG_BREAK, - - SWITCH_SIG_COUNT + SWITCH_SIG_BREAK } switch_signal_t; /*! @@ -710,9 +690,7 @@ SWITCH_CODEC_TYPE_AUDIO, SWITCH_CODEC_TYPE_VIDEO, SWITCH_CODEC_TYPE_T38, - SWITCH_CODEC_TYPE_APP, - - SWITCH_CODEC_TYPE_COUNT + SWITCH_CODEC_TYPE_APP } switch_codec_type_t; @@ -872,9 +850,7 @@ typedef enum { SWITCH_INPUT_TYPE_DTMF, - SWITCH_INPUT_TYPE_EVENT, - - SWITCH_INPUT_TYPE_COUNT + SWITCH_INPUT_TYPE_EVENT } switch_input_type_t; typedef enum { @@ -941,9 +917,7 @@ SCSC_PAUSE_INBOUND, SCSC_HUPALL, SCSC_SHUTDOWN, - SCSC_CHECK_RUNNING, - - SCSC_COUNT + SCSC_CHECK_RUNNING } switch_session_ctl_t; typedef uint16_t switch_port_t;

1 0

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

24 Mar '07

Author: mikej Date: Sat Mar 24 00:51:17 2007 New Revision: 4760 Modified: freeswitch/trunk/src/include/switch_log.h Log: quick comment Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Sat Mar 24 00:51:17 2007 @@ -64,6 +64,9 @@ switch_time_t timestamp; /*! A pointer to where the actual content of the message starts (skipping past the preformatted portion) */ char *content; + + /* To maintain abi, only add new elements to the end of this struct and do not delete any elements */ + } switch_log_node_t; typedef switch_status_t (*switch_log_function_t)(const switch_log_node_t *node, switch_log_level_t level);

1 0

[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