May 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5227 - freeswitch/trunk
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 13:20:57 2007 New Revision: 5227 Modified: freeswitch/trunk/configure.in Log: fix bsd build Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon May 28 13:20:57 2007 @@ -139,6 +139,9 @@ *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) ;; + *bsd*) + APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) + ;; esac APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)

1 0

[commit] r5226 - in freeswitch/trunk/libs/libedit: . src
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 01:52:34 2007 New Revision: 5226 Modified: freeswitch/trunk/libs/libedit/Makefile.am freeswitch/trunk/libs/libedit/src/el.c freeswitch/trunk/libs/libedit/src/sig.c freeswitch/trunk/libs/libedit/src/sig.h freeswitch/trunk/libs/libedit/src/term.c freeswitch/trunk/libs/libedit/src/unvis.c freeswitch/trunk/libs/libedit/src/vi.c freeswitch/trunk/libs/libedit/src/vis.c Log: fix bsd build Modified: freeswitch/trunk/libs/libedit/Makefile.am ============================================================================== --- freeswitch/trunk/libs/libedit/Makefile.am (original) +++ freeswitch/trunk/libs/libedit/Makefile.am Mon May 28 01:52:34 2007 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src examples doc +SUBDIRS = src ## GENERATED BY SCRIPT - DO NOT EDIT BELOW Modified: freeswitch/trunk/libs/libedit/src/el.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/el.c (original) +++ freeswitch/trunk/libs/libedit/src/el.c Mon May 28 01:52:34 2007 @@ -522,7 +522,9 @@ sigset_t oset, nset; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); /* get the correct window size */ Modified: freeswitch/trunk/libs/libedit/src/sig.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/sig.c (original) +++ freeswitch/trunk/libs/libedit/src/sig.c Mon May 28 01:52:34 2007 @@ -83,9 +83,11 @@ term__flush(); break; +#ifdef SIGWINCH case SIGWINCH: el_resize(sel); break; +#endif default: tty_cookedmode(sel); Modified: freeswitch/trunk/libs/libedit/src/sig.h ============================================================================== --- freeswitch/trunk/libs/libedit/src/sig.h (original) +++ freeswitch/trunk/libs/libedit/src/sig.h Mon May 28 01:52:34 2007 @@ -48,6 +48,7 @@ * Define here all the signals we are going to handle * The _DO macro is used to iterate in the source code */ +#ifdef SIGWINCH #define ALLSIGS \ _DO(SIGINT) \ _DO(SIGTSTP) \ @@ -57,6 +58,16 @@ _DO(SIGTERM) \ _DO(SIGCONT) \ _DO(SIGWINCH) +#else +#define ALLSIGS \ + _DO(SIGINT) \ + _DO(SIGTSTP) \ + _DO(SIGSTOP) \ + _DO(SIGQUIT) \ + _DO(SIGHUP) \ + _DO(SIGTERM) \ + _DO(SIGCONT) +#endif typedef void (*el_signalhandler_t)(int); typedef el_signalhandler_t *el_signal_t; Modified: freeswitch/trunk/libs/libedit/src/term.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/term.c (original) +++ freeswitch/trunk/libs/libedit/src/term.c Mon May 28 01:52:34 2007 @@ -905,7 +905,9 @@ int lins, cols; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); area = buf; Modified: freeswitch/trunk/libs/libedit/src/unvis.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/unvis.c (original) +++ freeswitch/trunk/libs/libedit/src/unvis.c Mon May 28 01:52:34 2007 @@ -63,7 +63,7 @@ #define S_HEX1 7 /* hex digit */ #define S_HEX2 8 /* hex digit 2 */ -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10)) /* Modified: freeswitch/trunk/libs/libedit/src/vi.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/vi.c (original) +++ freeswitch/trunk/libs/libedit/src/vi.c Mon May 28 01:52:34 2007 @@ -915,14 +915,14 @@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text; Modified: freeswitch/trunk/libs/libedit/src/vis.c ============================================================================== --- freeswitch/trunk/libs/libedit/src/vis.c (original) +++ freeswitch/trunk/libs/libedit/src/vis.c Mon May 28 01:52:34 2007 @@ -106,7 +106,7 @@ #undef BELL #define BELL '\a' -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define iswhite(c) (c == ' ' || c == '\t' || c == '\n') #define issafe(c) (c == '\b' || c == BELL || c == '\r') #define xtoa(c) "0123456789abcdef"[c] @@ -208,8 +208,8 @@ } \ if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \ *dst++ = '\\'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 6) & 03) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 3) & 07) + '0'; \ *dst++ = (c & 07) + '0'; \ } else { \ if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \

1 0

[commit] r5225 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 01:04:28 2007 New Revision: 5225 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix bsd build Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon May 28 01:04:28 2007 @@ -201,7 +201,7 @@ if (!strcasecmp(how, "xml")) { switch_xml_t xml; char *xmlstr; - if ((xml = switch_event_xmlize(ro->stream->event, NULL))) { + if ((xml = switch_event_xmlize(ro->stream->event, SWITCH_VA_NONE))) { xmlstr = switch_xml_toxml(xml); *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xmlstr)); return JS_TRUE;

1 0

[commit] r5224 - in freeswitch/trunk/libs/js/nsprpub/pr/src: io misc pthreads
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 01:01:08 2007 New Revision: 5224 Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c Log: fix bsd build Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/prfdcach.c Mon May 28 01:01:08 2007 @@ -259,8 +259,8 @@ ** be overridden at runtime using environment variables ** or a super-wiz-bang API. */ - //const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); - //const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); + /* const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); */ + /* const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); */ /* ** _low is allowed to be zero, _high is not. @@ -274,8 +274,8 @@ _pr_fd_cache.limit_high = 0; #endif /* defined(DEBUG) */ - //if (NULL != low) _pr_fd_cache.limit_low = atoi(low); - //if (NULL != high) _pr_fd_cache.limit_high = atoi(high); + /*if (NULL != low) _pr_fd_cache.limit_low = atoi(low);*/ + /*if (NULL != high) _pr_fd_cache.limit_high = atoi(high);*/ if (_pr_fd_cache.limit_high < _pr_fd_cache.limit_low) _pr_fd_cache.limit_high = _pr_fd_cache.limit_low; Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/prlog.c Mon May 28 01:01:08 2007 @@ -208,7 +208,7 @@ _pr_logLock = PR_NewLock(); -// ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf @@ -255,7 +255,7 @@ } PR_SetLogBuffering(isSync ? bufSize : 0); - //ev = PR_GetEnv("NSPR_LOG_FILE"); + /* ev = PR_GetEnv("NSPR_LOG_FILE"); */ if (ev && ev[0]) { if (!PR_SetLogFile(ev)) { #ifdef XP_PC @@ -318,7 +318,7 @@ { char *ev = NULL; - //ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/misc/prinit.c Mon May 28 01:01:08 2007 @@ -202,7 +202,6 @@ _PR_InitSegs(); _PR_InitStacks(); _PR_InitTPD(); - //_PR_InitEnv(); _PR_InitLayerCache(); _PR_InitClock(); @@ -234,22 +233,10 @@ _PR_InitMem(); #endif - //_PR_InitCMon(); _PR_InitIO(); - //_PR_InitNet(); _PR_InitLog(); - //_PR_InitLinker(); _PR_InitCallOnce(); - //_PR_InitDtoa(); _PR_InitMW(); - //_PR_InitRWLocks(); - - //nspr_InitializePRErrorTable(); - -#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE) - //_pr_init_ipv6(); -#endif - _PR_MD_FINAL_INIT(); } @@ -420,9 +407,7 @@ #endif _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); /* Release the primordial thread's private data, etc. */ _PR_CleanupThread(me); @@ -452,7 +437,6 @@ * Ideally, for each _PR_InitXXX(), there should be a corresponding * _PR_XXXCleanup() that we can call here. */ - //_PR_CleanupNet(); _PR_CleanupIO(); #ifdef WINNT _PR_CleanupCPUs(); @@ -461,7 +445,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); _PR_CleanupStacks(); _PR_CleanupBeforeExit(); _pr_initialized = PR_FALSE; Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c Mon May 28 01:01:08 2007 @@ -938,9 +938,7 @@ PR_Unlock(pt_book.ml); _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); _PR_LogCleanup(); _PR_CleanupNet(); /* Close all the fd's before calling _PR_CleanupIO */ @@ -963,7 +961,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); #ifdef _PR_ZONE_ALLOCATOR _PR_DestroyZones(); #endif

1 0

[commit] r5223 - freeswitch/trunk/src/include
by Freeswitch SVN 28 May '07

28 May '07

Author: mikej Date: Mon May 28 00:32:22 2007 New Revision: 5223 Modified: freeswitch/trunk/src/include/switch.h Log: fix bsd build Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Mon May 28 00:32:22 2007 @@ -55,6 +55,9 @@ #ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 600 #endif +#ifndef __BSD_VISIBLE +#define __BSD_VISIBLE 1 +#endif #endif #include <stdlib.h> #include <stdio.h>

1 0

[commit] r5222 - freeswitch/trunk/src
by Freeswitch SVN 26 May '07

26 May '07

Author: anthm Date: Sat May 26 15:03:16 2007 New Revision: 5222 Modified: freeswitch/trunk/src/switch_rtp.c Log: update 2833 *stab* Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat May 26 15:03:16 2007 @@ -752,13 +752,13 @@ rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; - rtp_session->dtmf_data.out_digit_seq++; - if (loops != 1) { - rtp_session->dtmf_data.timestamp_dtmf += samples; - } + rtp_session->dtmf_data.timestamp_dtmf += samples; + for (x = 0; x < loops; x++) { + rtp_session->dtmf_data.out_digit_seq++; + switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -770,6 +770,7 @@ loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, duration, rtp_session->dtmf_data.out_digit_seq); + } if (loops == 1) { @@ -804,7 +805,7 @@ for (x = 0; x < 3; x++) { - //rtp_session->dtmf_data.out_digit_seq++; + rtp_session->dtmf_data.out_digit_seq++; switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4,

1 0

[commit] r5221 - in freeswitch/trunk/src: . include
by Freeswitch SVN 26 May '07

26 May '07

Author: anthm Date: Fri May 25 23:27:02 2007 New Revision: 5221 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_ivr_play_say.c Log: small fixes Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri May 25 23:27:02 2007 @@ -52,8 +52,10 @@ #define FREESWITCH_ITAD "543" #define __EXTENSIONS__ 1 #ifndef MACOSX +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 600 #endif +#endif #include <stdlib.h> #include <stdio.h> #include <stdarg.h> Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Fri May 25 23:27:02 2007 @@ -260,6 +260,7 @@ assert(buffer->data != NULL); buffer->used = 0; + buffer->actually_used = 0; buffer->head = buffer->data; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri May 25 23:27:02 2007 @@ -830,7 +830,6 @@ status = SWITCH_STATUS_SUCCESS; continue; } else if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -851,6 +850,7 @@ switch_yield(10000); } status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } @@ -1042,7 +1042,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -1124,7 +1123,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -1145,7 +1143,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; }

1 0

[commit] r5220 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 17:36:22 2007 New Revision: 5220 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update 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 May 25 17:36:22 2007 @@ -27,7 +27,7 @@ $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) $(WANPIPE_KO): $(WANPIPE_DIR) - cd $(WANPIPE_DIR) && $(MAKE) + cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install @$(TOUCH_TARGET) $(WANPIPE_INSTALLED_KO): $(WANPIPE_KO)

1 0

[commit] r5219 - freeswitch/trunk/src
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 16:39:13 2007 New Revision: 5219 Modified: freeswitch/trunk/src/switch_log.c Log: WTF Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Fri May 25 16:39:13 2007 @@ -114,8 +114,9 @@ static void *SWITCH_THREAD_FUNC log_thread(switch_thread_t * thread, void *obj) { - /* To Be or Not To Be */ - assert(obj == NULL || obj != NULL); + if (!obj) { + obj = NULL; + } THREAD_RUNNING = 1; while (THREAD_RUNNING == 1) {

1 0

[commit] r5218 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 15:46:51 2007 New Revision: 5218 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: update 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 May 25 15:46:51 2007 @@ -3,8 +3,8 @@ LIBPRI=libpri-1.2.4 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -WANPIPE=wanpipe-3.1.0.p18 -WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 +WANPIPE=wanpipe-3.1.0 +WANPIPE_HOST=ftp://ftp.sangoma.com/linux/current_wanpipe/ WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include

1 0