August 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2363 - in freeswitch/trunk/libs/win32: . libresample pcre sqlite
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: mikej Date: Tue Aug 22 16:31:53 2006 New Revision: 2363 Added: freeswitch/trunk/libs/win32/libresample/cleancount freeswitch/trunk/libs/win32/pcre/cleancount freeswitch/trunk/libs/win32/sqlite/cleancount Modified: freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj freeswitch/trunk/libs/win32/Download PCRE.vcproj freeswitch/trunk/libs/win32/Download SQLITE.vcproj Log: Let msvc decide if it needs to re-run the download projects based upon the presence of the downloaded directory. This now works properly for these targets when it will scroll pass the target as "up-to-date" instead of running it and doing nothing. This should speed up the build process a bit. Modified: freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj Tue Aug 22 16:31:53 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading LIBRESAMPLE." - CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading LIBRESAMPLE." - CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\libresample\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading LIBRESAMPLE." + CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\libresample-0.1.3" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading LIBRESAMPLE." + CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\libresample-0.1.3" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download PCRE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download PCRE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download PCRE.vcproj Tue Aug 22 16:31:53 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading PCRE." - CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading PCRE." - CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\pcre\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading PCRE." + CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\pcre-6.4" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading PCRE." + CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\pcre-6.4" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download SQLITE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SQLITE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SQLITE.vcproj Tue Aug 22 16:31:53 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading SQLITE." - CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading SQLITE." - CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\sqlite\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading SQLITE." + CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\sqlite-source-3_3_6" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading SQLITE." + CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\sqlite-source-3_3_6" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Added: freeswitch/trunk/libs/win32/libresample/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/libresample/cleancount Tue Aug 22 16:31:53 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/pcre/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/pcre/cleancount Tue Aug 22 16:31:53 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/sqlite/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/sqlite/cleancount Tue Aug 22 16:31:53 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file

1 0

[commit] r2362 - freeswitch/branches/myusko
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: sphere Date: Tue Aug 22 16:19:46 2006 New Revision: 2362 Added: freeswitch/branches/myusko/ Log: Creating empty folder for myusko

1 0

[commit] r2361 - in freeswitch/trunk/src: . mod/applications/mod_bridgecall
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 14:29:00 2006 New Revision: 2361 Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/switch_ivr.c Log: update core Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Aug 22 14:29:00 2006 @@ -55,7 +55,6 @@ switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); return; } else { - /* peer channel is read locked now the bridge func will unlock it for us */ switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 22 14:29:00 2006 @@ -1560,7 +1560,6 @@ } if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { - switch_core_session_read_lock(peer_session); *bleg = peer_session; if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");

1 0

[commit] r2360 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 13:19:31 2006 New Revision: 2360 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix fileio 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 Tue Aug 22 13:19:31 2006 @@ -1541,9 +1541,10 @@ } switch_core_new_memory_pool(&pool); if (switch_file_open(&fd, path, flags, SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", path); switch_core_destroy_memory_pool(&pool); - return JS_FALSE; + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; } fio = switch_core_alloc(pool, sizeof(*fio)); fio->fd = fd; @@ -1554,7 +1555,7 @@ return JS_TRUE; } - return JS_FALSE; + return JS_TRUE; } static void fileio_destroy(JSContext *cx, JSObject *obj) { @@ -1579,6 +1580,10 @@ *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + if (fio) { + return JS_TRUE; + } + if (!(fio->flags & SWITCH_FOPEN_READ)) { return JS_TRUE; } @@ -1604,6 +1609,12 @@ static JSBool fileio_data(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct fileio_obj *fio = JS_GetPrivate(cx, obj); + + if (!fio) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, fio->buf)); return JS_TRUE; } @@ -1614,6 +1625,11 @@ switch_size_t wrote = 0; char *data = NULL; + if (!fio) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (!(fio->flags & SWITCH_FOPEN_WRITE)) { *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); return JS_TRUE; @@ -1633,7 +1649,7 @@ } enum fileio_tinyid { - FILEIO_PATH + FILEIO_PATH, FILEIO_OPEN }; static JSFunctionSpec fileio_methods[] = { @@ -1646,6 +1662,7 @@ static JSPropertySpec fileio_props[] = { {"path", FILEIO_PATH, JSPROP_READONLY|JSPROP_PERMANENT}, + {"open", FILEIO_OPEN, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; @@ -1667,8 +1684,15 @@ switch(param) { case FILEIO_PATH: - *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, fio->path)); + if (fio) { + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, fio->path)); + } else { + *vp = BOOLEAN_TO_JSVAL( JS_FALSE ); + } break; + case FILEIO_OPEN: + *vp = BOOLEAN_TO_JSVAL( fio ? JS_TRUE : JS_FALSE ); + break; } return res; @@ -2197,6 +2221,11 @@ /* Built-In*/ /*********************************************************************************/ +static JSBool js_exit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + return JS_FALSE; +} + static JSBool js_log(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { char *level_str, *msg; @@ -2433,6 +2462,7 @@ static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, + {"exit", js_exit, 0}, {"include", js_include, 1}, {"email", js_email, 2}, {"bridge", js_bridge, 2},

1 0

[commit] r2359 - in freeswitch/trunk/libs/win32: . apr apr-iconv apr-util
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: mikej Date: Tue Aug 22 12:30:35 2006 New Revision: 2359 Added: freeswitch/trunk/libs/win32/apr-iconv/cleancount freeswitch/trunk/libs/win32/apr-util/cleancount freeswitch/trunk/libs/win32/apr/cleancount Modified: freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj freeswitch/trunk/libs/win32/Download APR-Util.vcproj freeswitch/trunk/libs/win32/Download APR.vcproj Log: Let msvc decide if it needs to re-run the download projects based upon the presence of the downloaded directory. This now works properly for these targets when it will scroll pass the target as "up-to-date" instead of running it and doing nothing. This should speed up the build process a bit. Modified: freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj Tue Aug 22 12:30:35 2006 @@ -25,11 +25,6 @@ BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool - Name="VCPreBuildEventTool" - Description="Downloading APR-Iconv." - CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." - /> - <Tool Name="VCCustomBuildTool" /> <Tool @@ -49,11 +44,6 @@ BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool - Name="VCPreBuildEventTool" - Description="Downloading APR-Iconv." - CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." - /> - <Tool Name="VCCustomBuildTool" /> <Tool @@ -67,6 +57,30 @@ <References> </References> <Files> + <File + RelativePath=".\apr-iconv\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Iconv." + CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-iconv-1.1.1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Iconv." + CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-iconv-1.1.1" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download APR-Util.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR-Util.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR-Util.vcproj Tue Aug 22 12:30:35 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR-Util." - CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR-Util." - CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\apr-util\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Util." + CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\apr-util-1.2.7" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Util." + CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\apr-util-1.2.7" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download APR.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR.vcproj Tue Aug 22 12:30:35 2006 @@ -26,11 +26,13 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR." - CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Description="" + CommandLine="" /> <Tool Name="VCCustomBuildTool" + CommandLine="" + Outputs="" /> <Tool Name="VCMIDLTool" @@ -50,8 +52,8 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR." - CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Description="" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -67,6 +69,30 @@ <References> </References> <Files> + <File + RelativePath=".\apr\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR." + CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-1.2.7" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR." + CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-1.2.7" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Added: freeswitch/trunk/libs/win32/apr-iconv/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/apr-iconv/cleancount Tue Aug 22 12:30:35 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/apr-util/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/apr-util/cleancount Tue Aug 22 12:30:35 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/apr/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/apr/cleancount Tue Aug 22 12:30:35 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file

1 0

[commit] r2358 - freeswitch/trunk/src
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 10:48:35 2006 New Revision: 2358 Modified: freeswitch/trunk/src/switch_stun.c Log: Fix issue pointed out by Fanzhou Zhao <fanzhou(a)gmail.com> Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Tue Aug 22 10:48:35 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Fanzhou Zhao <fanzhou(a)gmail.com> 2006-08-22 (Bugfix 2357-2358) * * * switch_stun.c STUN (Simple Traversal of UDP over NAT) @@ -91,18 +92,18 @@ { char chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; int max; - uint8_t x; + uint16_t x; if (!set) { set = chars; } - max = (int)strlen(set) - 1; + max = (int)strlen(set); srand((unsigned int)apr_time_now()); for(x = 0; x < len; x++) { - int j = 1+(int)(max*1.0*rand()/(RAND_MAX+1.0)); + int j = (int)(max*1.0*rand()/(RAND_MAX+1.0)); buf[x] = set[j]; } }

1 0

[commit] r2357 - freeswitch/branches/newyoung
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: sphere Date: Tue Aug 22 02:04:37 2006 New Revision: 2357 Added: freeswitch/branches/newyoung/ Log: Creating empty folder for newyoung

1 0

[commit] r2356 - freeswitch/branches/ngokhiem
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: sphere Date: Tue Aug 22 01:36:29 2006 New Revision: 2356 Added: freeswitch/branches/ngokhiem/ Log: Creating empty folder for ngokhiem

1 0

[commit] r2355 - freeswitch/branches/huen
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: sphere Date: Tue Aug 22 00:55:32 2006 New Revision: 2355 Added: freeswitch/branches/huen/ Log: Creating empty folder for huen

1 0

[commit] r2354 - in freeswitch/trunk: . build libs src src/mod/languages/mod_spidermonkey src/mod/loggers/mod_syslog
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Mon Aug 21 20:56:27 2006 New Revision: 2354 Modified: freeswitch/trunk/Makefile.in freeswitch/trunk/build/buildlib.sh freeswitch/trunk/build/modmake.sh freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/trunk/src/switch_console.c Log: optimizations Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Mon Aug 21 20:56:27 2006 @@ -1108,6 +1108,7 @@ @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi @echo making modules @rm -f build/freeswitch.env + @if [ -f $(PWD)/modbuild.env ] ; then cp $(PWD)/modbuild.env build/freeswitch.env ; fi @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" Modified: freeswitch/trunk/build/buildlib.sh ============================================================================== --- freeswitch/trunk/build/buildlib.sh (original) +++ freeswitch/trunk/build/buildlib.sh Mon Aug 21 20:56:27 2006 @@ -67,7 +67,7 @@ MAKE=$MAKE ../$uncompressed.build.sh $@ else $MAKE clean 2>&1 - sh ./configure $@ + sh CFLAGS=$MOD_CFLAGS ./configure $@ if [ $? = 0 ] ; then $MAKE Modified: freeswitch/trunk/build/modmake.sh ============================================================================== --- freeswitch/trunk/build/modmake.sh (original) +++ freeswitch/trunk/build/modmake.sh Mon Aug 21 20:56:27 2006 @@ -20,8 +20,8 @@ fi if [ -f $mod/Makefile ] ; then - MODNAME=$end $make -C $mod $@ + CFLAGS="$MOD_CFLAGS $CFLAGS " MODNAME=$end $make -C $mod $@ else - MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ + CFLAGS="$MOD_CFLAGS $CFLAGS" MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ fi Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Mon Aug 21 20:56:27 2006 @@ -5,7 +5,7 @@ opts="--enable-64bit" fi -cd nsprpub && ./configure $opts && make +cd nsprpub && ./configure $opts && $MAKE -cd ../js/src && JS_THREADSAFE=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" make -f Makefile.ref `find . -name libjs.a` +cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` 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 Aug 21 20:56:27 2006 @@ -456,7 +456,7 @@ for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; @@ -573,7 +573,7 @@ for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; @@ -642,7 +642,7 @@ for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Mon Aug 21 20:56:27 2006 @@ -105,8 +105,8 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { - *interface = &console_module_interface; switch_status_t status; + *interface = &console_module_interface; if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { return status; Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Aug 21 20:56:27 2006 @@ -176,9 +176,9 @@ { char hostname[256]; char cmd[2048]; - int running = 1, x = 0, activity = 1; + int running = 1, activity = 1; char *retbuf = (char *)malloc(CMD_BUFLEN); - + switch_size_t x = 0; assert(retbuf != NULL); gethostname(hostname, sizeof(hostname));

1 0