- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2336 - in freeswitch/trunk/src: . include
by Freeswitch SVN 19 Aug '06

19 Aug '06

Author: mikej Date: Sat Aug 19 14:51:22 2006 New Revision: 2336 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Log: Add switch_core_init_and_modload to core, from switch.c. Add additional shutdown functionality to switch_core_destroy. move around more code in switch.c and fix freeswitch -stop on windows. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat Aug 19 14:51:22 2006 @@ -117,6 +117,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err); /*! + \brief Initilize the core and load modules + \param console optional FILE stream for output + \param err a pointer to set any errors to + \note to be called at application startup instead of switch_core_init. Includes module loading. +*/ +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err); + +/*! \brief Set/Get Session Limit \param new_limit new value (if > 0) \return the current session limit Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Aug 19 14:51:22 2006 @@ -31,17 +31,7 @@ */ #include <switch.h> -#include <switch_version.h> -#ifdef HAVE_MLOCKALL -#include <sys/mman.h> -#endif -#ifdef CRASH_PROT -#define __CP "ENABLED" -#else -#define __CP "DISABLED" -#endif - #define PIDFILE "freeswitch.pid" #define LOGFILE "freeswitch.log" static int RUNNING = 0; @@ -52,30 +42,13 @@ #pragma warning (disable:167) #endif -static int handle_SIGPIPE(int sig) -{ - if(sig); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig Pipe!\n"); - return 0; -} -#ifdef TRAP_BUS -static int handle_SIGBUS(int sig) -{ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig BUS!\n"); - return 0; -} + +#ifdef WIN32 +static HANDLE shutdown_event; #endif -/* no ctl-c mofo */ -static int handle_SIGINT(int sig) + static int handle_SIGHUP(int sig) { - if (sig); - return 0; -} - - -static int handle_SIGHUP(int sig) -{ if(sig); RUNNING = 0; return 0; @@ -90,44 +63,18 @@ #endif } -static int freeswitch_shutdown() -{ - switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_SHUTDOWN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Shutting Down"); - switch_event_fire(&event); - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); - switch_core_session_hupall(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); - switch_loadable_module_shutdown(); - switch_core_destroy(); - return 0; -} - static void freeswitch_runtime_loop(int bg) { - FILE *f; - char path[256] = ""; - snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); - if (bg) { bg = 0; +#ifdef WIN32 + WaitForSingleObject(shutdown_event, INFINITE); +#else RUNNING = 1; while(RUNNING) { -#ifdef WIN32 - bg++; - if(bg == 100) { - if ((f = fopen(path, "r")) == 0) { - break; - } - fclose(f); - bg = 0; - } -#endif switch_yield(10000); } +#endif } else { /* wait for console input */ switch_console_loop(); @@ -136,8 +83,7 @@ static int freeswitch_kill_background() { -#ifdef WIN32 -#else + FILE *f; char path[256] = ""; pid_t pid = 0; snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); @@ -147,52 +93,26 @@ } fscanf(f, "%d", &pid); if (pid > 0) { - fprintf(stderr, "Killing %d\n", (int) pid); + fprintf(stderr, "Killing: %d\n", (int) pid); +#ifdef WIN32 + snprintf(path, sizeof(path), "Global\\Freeswitch.%d", pid); + shutdown_event = OpenEvent(EVENT_MODIFY_STATE, FALSE, path); + if (!shutdown_event) { + /* we can't get the event, so we can't signal the process to shutdown */ + fprintf(stderr, "ERROR: Can't Shutdown: %d\n", (int) pid); + } else { + SetEvent(shutdown_event); + } + CloseHandle(shutdown_event); +#else kill(pid, SIGTERM); +#endif } fclose(f); -#endif return 0; } -static int freeswitch_init(char *path, const char **err) -{ - switch_event_t *event; - if (switch_core_init(path, err) != SWITCH_STATUS_SUCCESS) { - return 255; - } - - /* set signal handlers */ - signal(SIGINT, (void *) handle_SIGINT); -#ifdef SIGPIPE - signal(SIGPIPE, (void *) handle_SIGPIPE); -#endif -#ifdef TRAP_BUS - signal(SIGBUS, (void *) handle_SIGBUS); -#endif - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); - if (switch_loadable_module_init() != SWITCH_STATUS_SUCCESS) { - *err = "Cannot load modules"; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s", err); - return 255; - } - - if (switch_event_create(&event, SWITCH_EVENT_STARTUP) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Ready"); - switch_event_fire(&event); - } - -#ifdef HAVE_MLOCKALL - mlockall(MCL_CURRENT|MCL_FUTURE); -#endif - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "freeswitch Version %s Started. Crash Protection [%s] Max Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, switch_core_session_limit(0)); - return 0; -} - int main(int argc, char *argv[]) { char path[256] = ""; @@ -200,6 +120,7 @@ const char *err = NULL; int bg = 0; FILE *f; + pid_t pid = 0; set_high_priority(); switch_core_set_globals(); @@ -212,6 +133,15 @@ bg++; } + snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + if ((f = fopen(path, "w")) == 0) { + fprintf(stderr, "Cannot open pid file %s.\n", path); + return 255; + } + + fprintf(f, "%d", pid = getpid()); + fclose(f); + if (bg) { ppath = lfile; @@ -220,6 +150,8 @@ #ifdef WIN32 FreeConsole(); + snprintf(path, sizeof(path), "Global\\Freeswitch.%d", pid); + shutdown_event = CreateEvent(NULL, FALSE, FALSE, path); #else if ((pid = fork())) { fprintf(stderr, "%d Backgrounding.\n", (int)pid); @@ -228,21 +160,12 @@ #endif } - snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); - if ((f = fopen(path, "w")) == 0) { - fprintf(stderr, "Cannot open pid file %s.\n", path); - return 255; - } - - fprintf(f, "%d", getpid()); - fclose(f); - - if (freeswitch_init(ppath, &err) == 255) { + if (switch_core_init_and_modload(ppath, &err) != SWITCH_STATUS_SUCCESS) { fprintf(stderr, "Cannot Initilize [%s]\n", err); return 255; } freeswitch_runtime_loop(bg); - return freeswitch_shutdown(); + return switch_core_destroy(); } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Aug 19 14:51:22 2006 @@ -32,8 +32,20 @@ #include <switch.h> #include <stdio.h> +#include <switch_version.h> + +#ifdef HAVE_MLOCKALL +#include <sys/mman.h> +#endif + //#define DEBUG_ALLOC +#ifdef CRASH_PROT +#define __CP "ENABLED" +#else +#define __CP "DISABLED" +#endif + #define SWITCH_EVENT_QUEUE_LEN 256 #define SWITCH_SQL_QUEUE_LEN 2000 @@ -3109,8 +3121,66 @@ runtime.initiated = switch_time_now(); return SWITCH_STATUS_SUCCESS; } +#ifdef SIGPIPE +static int handle_SIGPIPE(int sig) +{ + if(sig); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig Pipe!\n"); + return 0; +} +#endif +#ifdef TRAP_BUS +static int handle_SIGBUS(int sig) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig BUS!\n"); + return 0; +} +#endif +/* no ctl-c mofo */ +static int handle_SIGINT(int sig) +{ + if (sig); + return 0; +} +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err) +{ + switch_event_t *event; + if (switch_core_init(console, err) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_GENERR; + } + /* set signal handlers */ + signal(SIGINT, (void *) handle_SIGINT); +#ifdef SIGPIPE + signal(SIGPIPE, (void *) handle_SIGPIPE); +#endif +#ifdef TRAP_BUS + signal(SIGBUS, (void *) handle_SIGBUS); +#endif + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); + if (switch_loadable_module_init() != SWITCH_STATUS_SUCCESS) { + *err = "Cannot load modules"; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s", err); + return SWITCH_STATUS_GENERR; + } + + if (switch_event_create(&event, SWITCH_EVENT_STARTUP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Ready"); + switch_event_fire(&event); + } + +#ifdef HAVE_MLOCKALL + mlockall(MCL_CURRENT|MCL_FUTURE); +#endif + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "freeswitch Version %s Started. Crash Protection [%s] Max Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, switch_core_session_limit(0)); + return SWITCH_STATUS_SUCCESS; + +} + SWITCH_DECLARE(void) switch_core_measure_time(switch_time_t total_ms, switch_core_time_duration_t *duration) { switch_time_t temp = total_ms / 1000; @@ -3135,6 +3205,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void) { + switch_event_t *event; + if (switch_event_create(&event, SWITCH_EVENT_SHUTDOWN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Shutting Down"); + switch_event_fire(&event); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); + switch_core_session_hupall(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); + switch_loadable_module_shutdown(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); switch_event_shutdown();

1 0

[commit] r2334 - freeswitch/trunk/src
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: mikej Date: Fri Aug 18 17:57:47 2006 New Revision: 2334 Modified: freeswitch/trunk/src/switch.c Log: factor out some functions, some of this will probably move to the freeswitch lib still. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Aug 18 17:57:47 2006 @@ -36,8 +36,22 @@ #include <sys/mman.h> #endif +#ifdef CRASH_PROT +#define __CP "ENABLED" +#else +#define __CP "DISABLED" +#endif + +#define PIDFILE "freeswitch.pid" +#define LOGFILE "freeswitch.log" static int RUNNING = 0; +static char *lfile = LOGFILE; +static char *pfile = PIDFILE; +#ifdef __ICC +#pragma warning (disable:167) +#endif + static int handle_SIGPIPE(int sig) { if(sig); @@ -67,76 +81,88 @@ return 0; } -int main(int argc, char *argv[]) +static void set_high_priority() { - char *lfile = "freeswitch.log"; - char *pfile = "freeswitch.pid"; - char path[256] = ""; - char *ppath = NULL; - const char *err = NULL; - switch_event_t *event; - int bg = 0; - FILE *f; #ifdef WIN32 SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); #else - int pid; nice(-20); #endif +} -#ifndef WIN32 - if (argv[1] && !strcmp(argv[1], "-stop")) { - pid_t pid = 0; - switch_core_set_globals(); - snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); - if ((f = fopen(path, "r")) == 0) { - fprintf(stderr, "Cannot open pid file %s.\n", path); - return 255; - } - fscanf(f, "%d", &pid); - if (pid > 0) { - fprintf(stderr, "Killing %d\n", (int) pid); - kill(pid, SIGTERM); - } - - fclose(f); - return 0; +static int freeswitch_shutdown() +{ + switch_event_t *event; + if (switch_event_create(&event, SWITCH_EVENT_SHUTDOWN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Shutting Down"); + switch_event_fire(&event); } -#endif - if (argv[1] && !strcmp(argv[1], "-nc")) { - bg++; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); + switch_core_session_hupall(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); + switch_loadable_module_shutdown(); + switch_core_destroy(); + return 0; +} - if (bg) { - //snprintf(path, sizeof(path), "%s%c%s", SWITCH_GLOBAL_dirs.log_dir, sep, lfile); - ppath = lfile; +static void freeswitch_runtime_loop(int bg) +{ + FILE *f; + char path[256] = ""; + snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); - signal(SIGHUP, (void *) handle_SIGHUP); - signal(SIGTERM, (void *) handle_SIGHUP); - + if (bg) { + bg = 0; + RUNNING = 1; + while(RUNNING) { #ifdef WIN32 - FreeConsole(); -#else - if ((pid = fork())) { - fprintf(stderr, "%d Backgrounding.\n", (int)pid); - exit(0); + bg++; + if(bg == 100) { + if ((f = fopen(path, "r")) == 0) { + break; + } + fclose(f); + bg = 0; } #endif - + switch_yield(10000); + } + } else { + /* wait for console input */ + switch_console_loop(); } +} - - if (switch_core_init(ppath, &err) != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "Cannot Initilize [%s]\n", err); +static int freeswitch_kill_background() +{ +#ifdef WIN32 +#else + char path[256] = ""; + pid_t pid = 0; + snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + if ((f = fopen(path, "r")) == 0) { + fprintf(stderr, "Cannot open pid file %s.\n", path); return 255; } + fscanf(f, "%d", &pid); + if (pid > 0) { + fprintf(stderr, "Killing %d\n", (int) pid); + kill(pid, SIGTERM); + } - -#ifdef __ICC -#pragma warning (disable:167) + fclose(f); #endif + return 0; +} +static int freeswitch_init(char *path, const char **err) +{ + switch_event_t *event; + if (switch_core_init(path, err) != SWITCH_STATUS_SUCCESS) { + return 255; + } + /* set signal handlers */ signal(SIGINT, (void *) handle_SIGINT); #ifdef SIGPIPE @@ -145,32 +171,13 @@ #ifdef TRAP_BUS signal(SIGBUS, (void *) handle_SIGBUS); #endif - - - - - - - snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); - if ((f = fopen(path, "w")) == 0) { - fprintf(stderr, "Cannot open pid file %s.\n", path); - return 255; - } - - fprintf(f, "%d", getpid()); - fclose(f); - if (!err) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); - if (switch_loadable_module_init() != SWITCH_STATUS_SUCCESS) { - err = "Cannot load modules"; - } - } - - if (err) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Loading Modules.\n"); + if (switch_loadable_module_init() != SWITCH_STATUS_SUCCESS) { + *err = "Cannot load modules"; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Error: %s", err); - exit(-1); + return 255; } if (switch_event_create(&event, SWITCH_EVENT_STARTUP) == SWITCH_STATUS_SUCCESS) { @@ -182,46 +189,60 @@ mlockall(MCL_CURRENT|MCL_FUTURE); #endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "freeswitch Version %s Started. Crash Protection [%s] Max Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, switch_core_session_limit(0)); + return 0; +} -#ifdef CRASH_PROT -#define __CP "ENABLED" -#else -#define __CP "DISABLED" -#endif +int main(int argc, char *argv[]) +{ + char path[256] = ""; + char *ppath = NULL; + const char *err = NULL; + int bg = 0; + FILE *f; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "freeswitch Version %s Started. Crash Protection [%s] Max Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, switch_core_session_limit(0)); - snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + set_high_priority(); + switch_core_set_globals(); + if (argv[1] && !strcmp(argv[1], "-stop")) { + return freeswitch_kill_background(); + } + + if (argv[1] && !strcmp(argv[1], "-nc")) { + bg++; + } + if (bg) { - bg = 0; - RUNNING = 1; - while(RUNNING) { + ppath = lfile; + + signal(SIGHUP, (void *) handle_SIGHUP); + signal(SIGTERM, (void *) handle_SIGHUP); + #ifdef WIN32 - bg++; - if(bg == 100) { - if ((f = fopen(path, "r")) == 0) { - break; - } - fclose(f); - bg = 0; + FreeConsole(); +#else + if ((pid = fork())) { + fprintf(stderr, "%d Backgrounding.\n", (int)pid); + exit(0); } #endif - switch_yield(10000); - } - } else { - /* wait for console input */ - switch_console_loop(); } - - if (switch_event_create(&event, SWITCH_EVENT_SHUTDOWN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Shutting Down"); - switch_event_fire(&event); + + snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + if ((f = fopen(path, "w")) == 0) { + fprintf(stderr, "Cannot open pid file %s.\n", path); + return 255; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); - switch_core_session_hupall(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); - switch_loadable_module_shutdown(); - switch_core_destroy(); - return 0; + fprintf(f, "%d", getpid()); + fclose(f); + + if (freeswitch_init(ppath, &err) == 255) { + fprintf(stderr, "Cannot Initilize [%s]\n", err); + return 255; + } + + freeswitch_runtime_loop(bg); + + return freeswitch_shutdown(); }

1 0

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

18 Aug '06

Author: anthm Date: Fri Aug 18 17:18:41 2006 New Revision: 2332 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add funcs to js 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 Fri Aug 18 17:18:41 2006 @@ -674,6 +674,38 @@ } +static JSBool session_flush_digits(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_channel_t *channel; + char buf[256]; + switch_size_t has; + + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if ((has = switch_channel_has_dtmf(channel))) { + switch_channel_dequeue_dtmf(channel, buf, has); + } + + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; +} + +static JSBool session_flush_events(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_event_t *event; + + while (switch_core_session_dequeue_event(jss->session, &event) == SWITCH_STATUS_SUCCESS) { + switch_event_destroy(&event); + } + + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; + +} + static JSBool session_recordfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -1158,6 +1190,8 @@ static JSFunctionSpec session_methods[] = { {"streamFile", session_streamfile, 1}, {"recordFile", session_recordfile, 1}, + {"flushEvents", session_flush_events, 1}, + {"flushDigits", session_flush_digits, 1}, {"speak", session_speak, 1}, {"getDigits", session_get_digits, 1}, {"answer", session_answer, 0},

1 0

[commit] r2331 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Fri Aug 18 17:02:55 2006 New Revision: 2331 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: google part 1001 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Aug 18 17:02:55 2006 @@ -1653,7 +1653,6 @@ break; case LDL_SIGNAL_TRANSPORT_ACCEPT: switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); - printf("\n**************************************\n"); break; case LDL_SIGNAL_INITIATE: if (signal) {

1 0

[commit] r2330 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Fri Aug 18 17:02:40 2006 New Revision: 2330 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: google part 1000 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Aug 18 17:02:40 2006 @@ -326,6 +326,8 @@ } tag = iks_next_tag(tag); } + } else if (!strcasecmp(type, "transport-accept")) { + signal = LDL_SIGNAL_TRANSPORT_ACCEPT; } else if (!strcasecmp(type, "transport-info")) { char *tid = iks_find_attrib(xml, "id"); signal = LDL_SIGNAL_CANDIDATES; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Fri Aug 18 17:02:40 2006 @@ -123,7 +123,8 @@ LDL_SIGNAL_ERROR, LDL_SIGNAL_LOGIN_SUCCESS, LDL_SIGNAL_LOGIN_FAILURE, - LDL_SIGNAL_CONNECTED + LDL_SIGNAL_CONNECTED, + LDL_SIGNAL_TRANSPORT_ACCEPT } ldl_signal_t; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Aug 18 17:02:40 2006 @@ -66,7 +66,8 @@ TFLAG_AUTO = (1 << 17), TFLAG_DTMF = (1 << 18), TFLAG_TIMER = ( 1 << 19), - TFLAG_TERM = ( 1 << 20) + TFLAG_TERM = ( 1 << 20), + TFLAG_TRANSPORT_ACCEPT = (1 << 21), } TFLAGS; typedef enum { @@ -542,6 +543,7 @@ while(! (switch_test_flag(tech_pvt, TFLAG_CODEC_READY) && switch_test_flag(tech_pvt, TFLAG_RTP_READY) && switch_test_flag(tech_pvt, TFLAG_ANSWER) && + switch_test_flag(tech_pvt, TFLAG_TRANSPORT_ACCEPT) && switch_test_flag(tech_pvt, TFLAG_TRANSPORT))) { now = switch_time_now(); elapsed = (unsigned int)((now - started) / 1000); @@ -1608,6 +1610,7 @@ tech_pvt->local_port = switch_rtp_request_port(); switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); tech_pvt->recip = switch_core_session_strdup(session, from); + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n"); terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -1648,7 +1651,9 @@ } break; - + case LDL_SIGNAL_TRANSPORT_ACCEPT: + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); + printf("\n**************************************\n"); break; case LDL_SIGNAL_INITIATE: if (signal) {

1 0

[commit] r2329 - freeswitch/trunk/src
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Fri Aug 18 16:03:34 2006 New Revision: 2329 Modified: freeswitch/trunk/src/switch_core.c Log: tweaks part 2 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Aug 18 16:03:34 2006 @@ -291,7 +291,7 @@ } switch_mutex_unlock(runtime.session_table_mutex); - while(runtime.session_count) { + while(runtime.session_count > 0) { switch_yield(10000); } } @@ -2492,7 +2492,9 @@ pool = NULL; switch_mutex_lock(runtime.session_table_mutex); - runtime.session_count--; + if (runtime.session_count) { + runtime.session_count--; + } switch_mutex_unlock(runtime.session_table_mutex); }

1 0

[commit] r2328 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Fri Aug 18 15:29:42 2006 New Revision: 2328 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: tweaks Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Aug 18 15:29:42 2006 @@ -201,8 +201,10 @@ if (state > CS_INIT && state < CS_HANGUP) { channel_on_hangup(*session); } - - ldl_session_set_private(tech_pvt->dlsession, NULL); + + if (tech_pvt->dlsession) { + ldl_session_set_private(tech_pvt->dlsession, NULL); + } switch_core_session_destroy(session); } }

1 0

[commit] r2327 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Fri Aug 18 14:44:11 2006 New Revision: 2327 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: last round of google cleanup rebuild libdingaling Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Aug 18 14:44:11 2006 @@ -201,16 +201,20 @@ if (session) { apr_pool_t *pool = session->pool; + apr_hash_t *hash = session->handle->sessions; if (globals.debug) { globals.logger(DL_LOG_DEBUG, "Destroyed Session %s\n", session->id); } + if (session->id) { - apr_hash_set(session->handle->sessions, session->id, APR_HASH_KEY_STRING, NULL); + apr_hash_set(hash, session->id, APR_HASH_KEY_STRING, NULL); } + if (session->them) { - apr_hash_set(session->handle->sessions, session->them, APR_HASH_KEY_STRING, NULL); + apr_hash_set(hash, session->them, APR_HASH_KEY_STRING, NULL); } + apr_pool_destroy(pool); pool = NULL; *session_p = NULL; @@ -501,6 +505,8 @@ char *iqid = iks_find_attrib(pak->x, "id"); char *type = iks_find_attrib(pak->x, "type"); uint8_t is_result = strcasecmp(type, "result") ? 0 : 1; + uint8_t is_error = strcasecmp(type, "error") ? 0 : 1; + iks *xml; if (is_result) { @@ -550,18 +556,18 @@ } } - if ((is_result || !strcasecmp(type, "error")) && iqid && from) { + if ((is_result || is_error) && iqid && from) { + cancel_retry(handle, iqid); if (is_result) { if (handle->response_callback) { handle->response_callback(handle, iqid); } return IKS_FILTER_EAT; + } else if (is_error) { + return IKS_FILTER_EAT; } } - - - xml = iks_child (pak->x); while (xml) { Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Aug 18 14:44:11 2006 @@ -65,7 +65,8 @@ TFLAG_LANADDR = (1 << 16), TFLAG_AUTO = (1 << 17), TFLAG_DTMF = (1 << 18), - TFLAG_TIMER = ( 1 << 19) + TFLAG_TIMER = ( 1 << 19), + TFLAG_TERM = ( 1 << 20) } TFLAGS; typedef enum { @@ -185,7 +186,10 @@ assert(tech_pvt != NULL); if (tech_pvt->dlsession) { - ldl_session_terminate(tech_pvt->dlsession); + if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { + ldl_session_terminate(tech_pvt->dlsession); + switch_set_flag_locked(tech_pvt, TFLAG_TERM); + } ldl_session_destroy(&tech_pvt->dlsession); } @@ -682,7 +686,10 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); if (tech_pvt->dlsession) { - ldl_session_terminate(tech_pvt->dlsession); + if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { + ldl_session_terminate(tech_pvt->dlsession); + switch_set_flag_locked(tech_pvt, TFLAG_TERM); + } ldl_session_destroy(&tech_pvt->dlsession); } @@ -717,7 +724,10 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); if (tech_pvt->dlsession) { - ldl_session_terminate(tech_pvt->dlsession); + if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { + ldl_session_terminate(tech_pvt->dlsession); + switch_set_flag_locked(tech_pvt, TFLAG_TERM); + } ldl_session_destroy(&tech_pvt->dlsession); } @@ -1840,6 +1850,7 @@ switch_channel_state_t state = switch_channel_get_state(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel), state, CS_INIT); switch_mutex_lock(tech_pvt->flag_mutex); + switch_set_flag(tech_pvt, TFLAG_TERM); switch_set_flag(tech_pvt, TFLAG_BYE); switch_clear_flag(tech_pvt, TFLAG_IO); switch_mutex_unlock(tech_pvt->flag_mutex);

1 0

[commit] r2326 - in freeswitch/trunk/src/mod: codecs/mod_speex endpoints/mod_dingaling
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Fri Aug 18 12:36:26 2006 New Revision: 2326 Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: more tweaks for google compat Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile Fri Aug 18 12:36:26 2006 @@ -1,7 +1,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.12.tar.gz --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Fri Aug 18 12:36:26 2006 @@ -205,6 +205,7 @@ speex_bits_pack(&context->encoder_bits, 15, 5); *encoded_data_len = speex_bits_write(&context->encoder_bits, (char *) encoded_data, context->encoder_frame_size); speex_bits_reset(&context->encoder_bits); + (*encoded_data_len)--; return SWITCH_STATUS_SUCCESS; } @@ -287,10 +288,10 @@ static const switch_codec_implementation_t speex_16k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 100, + /*.ianacode */ 99, /*.iananame */ "speex", - /*.samples_per_second */ 22000, - /*.bits_per_second */ 128000, + /*.samples_per_second */ 16000, + /*.bits_per_second */ 22000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 320, /*.bytes_per_frame */ 640, @@ -307,14 +308,14 @@ static const switch_codec_implementation_t speex_8k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 97, + /*.ianacode */ 98, /*.iananame */ "speex", /*.samples_per_second */ 8000, /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 160, /*.bytes_per_frame */ 320, - /*.encoded_bytes_per_frame */ 28, + /*.encoded_bytes_per_frame */ 0, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Aug 18 12:36:26 2006 @@ -135,6 +135,7 @@ char *codec_name; switch_payload_t codec_num; switch_payload_t r_codec_num; + uint32_t codec_rate; switch_time_t next_desc; switch_time_t next_cand; char *stun_ip; @@ -172,6 +173,37 @@ static ldl_status handle_response(ldl_handle_t *handle, char *id); static switch_status_t load_config(void); + +static void terminate_session(switch_core_session_t **session, switch_call_cause_t cause) +{ + if (*session) { + switch_channel_t *channel = switch_core_session_get_channel(*session); + switch_channel_state_t state = switch_channel_get_state(channel); + struct private_object *tech_pvt = NULL; + + tech_pvt = switch_core_session_get_private(*session); + assert(tech_pvt != NULL); + + if (tech_pvt->dlsession) { + ldl_session_terminate(tech_pvt->dlsession); + ldl_session_destroy(&tech_pvt->dlsession); + } + + if (state > CS_INIT && state < CS_HANGUP) { + switch_channel_hangup(channel, cause); + } + + if (!switch_core_session_runing(*session)) { + if (state > CS_INIT && state < CS_HANGUP) { + channel_on_hangup(*session); + } + + ldl_session_set_private(tech_pvt->dlsession, NULL); + switch_core_session_destroy(session); + } + } +} + static void dl_logger(char *file, const char *func, int line, int level, char *fmt, ...) { va_list ap; @@ -185,24 +217,28 @@ va_end(ap); } -static void get_codecs(struct private_object *tech_pvt) +static int get_codecs(struct private_object *tech_pvt) { assert(tech_pvt != NULL); assert(tech_pvt->session != NULL); - if (globals.codec_string) { - if ((tech_pvt->num_codecs = switch_loadable_module_get_codecs_sorted(tech_pvt->codecs, - SWITCH_MAX_CODECS, - globals.codec_order, - globals.codec_order_last)) <= 0) { + if (!tech_pvt->num_codecs) { + if (globals.codec_string) { + if ((tech_pvt->num_codecs = switch_loadable_module_get_codecs_sorted(tech_pvt->codecs, + SWITCH_MAX_CODECS, + globals.codec_order, + globals.codec_order_last)) <= 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n"); + return 0; + } + } else if (((tech_pvt->num_codecs = + switch_loadable_module_get_codecs(switch_core_session_get_pool(tech_pvt->session), tech_pvt->codecs, SWITCH_MAX_CODECS))) <= 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n"); - return; + return 0; } - } else if (((tech_pvt->num_codecs = - switch_loadable_module_get_codecs(switch_core_session_get_pool(tech_pvt->session), tech_pvt->codecs, SWITCH_MAX_CODECS))) <= 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n"); - return; } + + return tech_pvt->num_codecs; } @@ -253,12 +289,12 @@ } if (switch_core_codec_init(&tech_pvt->read_codec, - tech_pvt->codec_name, - 8000, - ms, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + tech_pvt->codec_name, + tech_pvt->codec_rate, + ms, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't load codec?\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return 0; @@ -266,20 +302,22 @@ tech_pvt->read_frame.rate = tech_pvt->read_codec.implementation->samples_per_second; tech_pvt->read_frame.codec = &tech_pvt->read_codec; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Read Codec to %s\n", tech_pvt->codec_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Read Codec to %s@%d\n", + tech_pvt->codec_name, (int)tech_pvt->read_codec.implementation->samples_per_second); if (switch_core_codec_init(&tech_pvt->write_codec, - tech_pvt->codec_name, - 8000, - ms, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + tech_pvt->codec_name, + tech_pvt->codec_rate, + ms, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't load codec?\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return 0; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Write Codec to %s\n", tech_pvt->codec_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Write Codec to %s@%d\n", + tech_pvt->codec_name,(int)tech_pvt->write_codec.implementation->samples_per_second); switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); @@ -329,14 +367,12 @@ assert(channel != NULL); if (switch_test_flag(tech_pvt, TFLAG_DO_CAND)) { - return 0; + return 1; } - - tech_pvt->next_cand += DL_CAND_WAIT; if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - return -1; + return 0; } switch_set_flag_locked(tech_pvt, TFLAG_DO_CAND); @@ -367,7 +403,7 @@ if (!stun_ip) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! NO STUN SERVER!\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return -1; + return 0; } cand[0].address = tech_pvt->profile->ip; @@ -380,7 +416,7 @@ switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, err); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return -1; + return 0; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Stun Success %s:%d\n", cand[0].address, cand[0].port); } @@ -401,7 +437,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_RTP_READY); } switch_clear_flag_locked(tech_pvt, TFLAG_DO_CAND); - return 0; + return 1; } static char *lame(char *in) @@ -420,32 +456,31 @@ assert(channel != NULL); if (switch_test_flag(tech_pvt, TFLAG_DO_DESC)) { - return 0; + return 1; } tech_pvt->next_desc += DL_CAND_WAIT; if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - return -1; + return 0; } memset(payloads, 0, sizeof(payloads)); switch_set_flag_locked(tech_pvt, TFLAG_DO_CAND); - if (!tech_pvt->num_codecs) { - get_codecs(tech_pvt); - if (!tech_pvt->num_codecs) { - switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); - switch_clear_flag_locked(tech_pvt, TFLAG_IO); - return -1; - } + if (!get_codecs(tech_pvt)) { + terminate_session(&tech_pvt->session, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + return 0; } + if (force || !switch_test_flag(tech_pvt, TFLAG_CODEC_READY)) { if (tech_pvt->codec_index < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Don't have my codec yet here's one\n"); tech_pvt->codec_name = lame(tech_pvt->codecs[0]->iananame); tech_pvt->codec_num = tech_pvt->codecs[0]->ianacode; + tech_pvt->codec_rate = tech_pvt->codecs[0]->samples_per_second; tech_pvt->r_codec_num = tech_pvt->codecs[0]->ianacode; tech_pvt->codec_index = 0; @@ -468,7 +503,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_CODEC_READY); } switch_clear_flag_locked(tech_pvt, TFLAG_DO_CAND); - return 0; + return 1; } static void *SWITCH_THREAD_FUNC negotiate_thread_run(switch_thread_t *thread, void *obj) @@ -511,18 +546,18 @@ if (now >= tech_pvt->next_desc) { - if (do_describe(tech_pvt, 0) < 0) { - break; + if (!do_describe(tech_pvt, 0)) { + goto out; } } if (tech_pvt->next_cand && now >= tech_pvt->next_cand) { - if (do_candidates(tech_pvt, 0) < 0) { - break; + if (!do_candidates(tech_pvt, 0)) { + goto out; } } if (elapsed > 60000) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + terminate_session(&tech_pvt->session, SWITCH_CAUSE_NORMAL_CLEARING); switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_clear_flag_locked(tech_pvt, TFLAG_IO); return NULL; @@ -543,7 +578,9 @@ } if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - do_candidates(tech_pvt, 0); + if (!do_candidates(tech_pvt, 0)) { + goto out; + } switch_channel_answer(channel); //printf("***************************ANSWER\n"); } else { @@ -553,10 +590,7 @@ return NULL; out: - if (!switch_core_session_runing(tech_pvt->session)) { - channel_on_hangup(tech_pvt->session); - switch_core_session_destroy(&tech_pvt->session); - } + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return NULL; } @@ -681,13 +715,17 @@ switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); switch_set_flag_locked(tech_pvt, TFLAG_BYE); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + if (tech_pvt->dlsession) { ldl_session_terminate(tech_pvt->dlsession); + ldl_session_destroy(&tech_pvt->dlsession); + } + if (tech_pvt->rtp_session) { switch_rtp_kill_socket(tech_pvt->rtp_session); } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); } } @@ -824,7 +862,7 @@ switch_clear_flag_locked(tech_pvt, TFLAG_READING); if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + terminate_session(&session, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } @@ -857,7 +895,7 @@ if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + terminate_session(&session, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } @@ -1048,7 +1086,7 @@ *callto++ = '\0'; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid URL!\n"); - switch_core_session_destroy(new_session); + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } @@ -1059,17 +1097,17 @@ if ((mdl_profile = switch_core_hash_find(globals.profile_hash, profile_name))) { if (!ldl_handle_ready(mdl_profile->handle)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! we are not logged in yet!\n"); - switch_core_session_destroy(new_session); + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } if (!(full_id = ldl_handle_probe(mdl_profile->handle, callto, idbuf, sizeof(idbuf)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unknown Recipient!\n"); - switch_core_session_destroy(new_session); + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unknown Profile!\n"); - switch_core_session_destroy(new_session); + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } @@ -1089,7 +1127,7 @@ tech_pvt->dnis = switch_core_session_strdup(*new_session, dnis); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); - switch_core_session_destroy(new_session); + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } @@ -1104,7 +1142,7 @@ tech_pvt->caller_profile = caller_profile; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! no caller profile\n"); - switch_core_session_destroy(new_session); + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } @@ -1120,7 +1158,10 @@ ldl_session_set_value(dlsession, "caller_id_name", outbound_profile->caller_id_name); ldl_session_set_value(dlsession, "caller_id_number", outbound_profile->caller_id_number); tech_pvt->dlsession = dlsession; - get_codecs(tech_pvt); + if (!get_codecs(tech_pvt)) { + terminate_session(new_session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_STATUS_GENERR; + } //tech_pvt->desc_id = ldl_session_describe(dlsession, NULL, 0, LDL_DESCRIPTION_INITIATE); negotiate_thread_launch(*new_session); return SWITCH_STATUS_SUCCESS; @@ -1557,7 +1598,7 @@ tech_pvt->recip = switch_core_session_strdup(session, from); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n"); - switch_core_session_destroy(&session); + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return LDL_STATUS_FALSE; } @@ -1606,7 +1647,9 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { if (!strcasecmp(msg, "accept")) { switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); - do_candidates(tech_pvt, 0); + if (!do_candidates(tech_pvt, 0)) { + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } } } @@ -1615,11 +1658,10 @@ break; } - if (!tech_pvt->num_codecs) { - get_codecs(tech_pvt); - if (!tech_pvt->num_codecs) { - return LDL_STATUS_FALSE; - } + + if (!get_codecs(tech_pvt)) { + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return LDL_STATUS_FALSE; } @@ -1646,15 +1688,22 @@ tech_pvt->codec_name = tech_pvt->codecs[y]->iananame; tech_pvt->codec_num = tech_pvt->codecs[y]->ianacode; tech_pvt->r_codec_num = (switch_payload_t)(payloads[x].id); + tech_pvt->codec_rate = payloads[x].rate; if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - do_describe(tech_pvt, 0); + if (!do_describe(tech_pvt, 0)) { + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return LDL_STATUS_FALSE; + } } return LDL_STATUS_SUCCESS; } } } if (!match && !switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - do_describe(tech_pvt, 0); + if (!do_describe(tech_pvt, 0)) { + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return LDL_STATUS_FALSE; + } } } } @@ -1757,12 +1806,11 @@ switch_set_flag_locked(tech_pvt, TFLAG_LANADDR); } - if (!tech_pvt->num_codecs) { - get_codecs(tech_pvt); - if (!tech_pvt->num_codecs) { - return LDL_STATUS_FALSE; - } + if (!get_codecs(tech_pvt)) { + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return LDL_STATUS_FALSE; } + tech_pvt->remote_ip = switch_core_session_strdup(session, candidates[x].address); ldl_session_set_ip(dlsession, tech_pvt->remote_ip); @@ -1771,7 +1819,10 @@ if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - do_candidates(tech_pvt, 0); + if (!do_candidates(tech_pvt, 0)) { + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return LDL_STATUS_FALSE; + } } @@ -1792,11 +1843,11 @@ switch_set_flag(tech_pvt, TFLAG_BYE); switch_clear_flag(tech_pvt, TFLAG_IO); switch_mutex_unlock(tech_pvt->flag_mutex); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + terminate_session(&session, SWITCH_CAUSE_NORMAL_CLEARING); if (state <= CS_INIT && !switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroy unused Session\n"); - switch_core_session_destroy(&session); + terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call\n"); }

1 0

[commit] r2325 - in freeswitch/trunk: . libs/codec/gsm libs/codec/ilbc libs/iax libs/libdingaling libs/srtp libs/win32 libs/win32/apr-util libs/win32/howl libs/win32/iksemel libs/win32/js libs/win32/libresample libs/win32/libsndfile libs/win32/portaudio libs/win32/xmlrpc src/mod/applications/mod_bridgecall src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_dptools src/mod/applications/mod_echo src/mod/applications/mod_ivrtest src/mod/application
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: mikej Date: Fri Aug 18 03:22:18 2006 New Revision: 2325 Added: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj - copied, changed from r2323, /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj Removed: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj freeswitch/trunk/w32/vsnet/Tools/PortAudio/ freeswitch/trunk/w32/vsnet/Tools/apr/ freeswitch/trunk/w32/vsnet/Tools/curl/ freeswitch/trunk/w32/vsnet/Tools/gnutls/ freeswitch/trunk/w32/vsnet/Tools/howl/ freeswitch/trunk/w32/vsnet/Tools/iksemel/ freeswitch/trunk/w32/vsnet/Tools/libetpan.vcproj freeswitch/trunk/w32/vsnet/Tools/libsndfile/ freeswitch/trunk/w32/vsnet/Tools/libsndfile.vcproj freeswitch/trunk/w32/vsnet/Tools/libspeex.vcproj freeswitch/trunk/w32/vsnet/Tools/openldap/ freeswitch/trunk/w32/vsnet/Tools/pcre/ freeswitch/trunk/w32/vsnet/Tools/sqlite.vcproj freeswitch/trunk/w32/vsnet/Tools/xmlrpc/ Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/libs/codec/gsm/libgsm.vcproj freeswitch/trunk/libs/codec/ilbc/libilbc.vcproj freeswitch/trunk/libs/iax/libiax2.vcproj freeswitch/trunk/libs/libdingaling/libdingaling.vcproj freeswitch/trunk/libs/srtp/libsrtp.vcproj freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj freeswitch/trunk/libs/win32/Download APR-Util.vcproj freeswitch/trunk/libs/win32/Download APR.vcproj freeswitch/trunk/libs/win32/Download CURL.vcproj freeswitch/trunk/libs/win32/Download EXOSIP.vcproj freeswitch/trunk/libs/win32/Download HOWL.vcproj freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj freeswitch/trunk/libs/win32/Download PCRE.vcproj freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj freeswitch/trunk/libs/win32/Download SPEEX.vcproj freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj freeswitch/trunk/libs/win32/Download SQLITE.vcproj freeswitch/trunk/libs/win32/Download XMLRPC.vcproj freeswitch/trunk/libs/win32/apr-util/xml.vcproj freeswitch/trunk/libs/win32/howl/libhowl.vcproj freeswitch/trunk/libs/win32/iksemel/iksemel.vcproj freeswitch/trunk/libs/win32/js/fdlibm.vcproj freeswitch/trunk/libs/win32/js/js.vcproj freeswitch/trunk/libs/win32/libresample/libresample.vcproj freeswitch/trunk/libs/win32/libsndfile/libsndfile.vcproj freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj freeswitch/trunk/libs/win32/xmlrpc/Abyss.vcproj freeswitch/trunk/libs/win32/xmlrpc/xmlrpc.vcproj freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.vcproj freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.vcproj freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/trunk/w32/vsnet/FreeSwitchConsole.vcproj freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj freeswitch/trunk/w32/vsnet/FreeSwitchVersion.vcproj Log: Cleanups from update to new build system for windows. More to come. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Aug 18 03:22:18 2006 @@ -41,7 +41,7 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfilel.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} Modified: freeswitch/trunk/libs/codec/gsm/libgsm.vcproj ============================================================================== --- freeswitch/trunk/libs/codec/gsm/libgsm.vcproj (original) +++ freeswitch/trunk/libs/codec/gsm/libgsm.vcproj Fri Aug 18 03:22:18 2006 @@ -48,7 +48,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/codec/ilbc/libilbc.vcproj ============================================================================== --- freeswitch/trunk/libs/codec/ilbc/libilbc.vcproj (original) +++ freeswitch/trunk/libs/codec/ilbc/libilbc.vcproj Fri Aug 18 03:22:18 2006 @@ -47,7 +47,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/iax/libiax2.vcproj ============================================================================== --- freeswitch/trunk/libs/iax/libiax2.vcproj (original) +++ freeswitch/trunk/libs/iax/libiax2.vcproj Fri Aug 18 03:22:18 2006 @@ -48,7 +48,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/libdingaling/libdingaling.vcproj ============================================================================== --- freeswitch/trunk/libs/libdingaling/libdingaling.vcproj (original) +++ freeswitch/trunk/libs/libdingaling/libdingaling.vcproj Fri Aug 18 03:22:18 2006 @@ -48,7 +48,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/srtp/libsrtp.vcproj ============================================================================== --- freeswitch/trunk/libs/srtp/libsrtp.vcproj (original) +++ freeswitch/trunk/libs/srtp/libsrtp.vcproj Fri Aug 18 03:22:18 2006 @@ -54,7 +54,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" 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 Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" 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 Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download APR.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download CURL.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download CURL.vcproj (original) +++ freeswitch/trunk/libs/win32/Download CURL.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download EXOSIP.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download EXOSIP.vcproj (original) +++ freeswitch/trunk/libs/win32/Download EXOSIP.vcproj Fri Aug 18 03:22:18 2006 @@ -22,11 +22,12 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Description="Downloading EXOSIP." - CommandLine="if not exist $(ProjectDir)..\libosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz $(ProjectDir)..
if not exist $(ProjectDir)..\libeXosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz $(ProjectDir).." + CommandLine="if not exist $(ProjectDir)..\libosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz $(ProjectDir)..
if not exist $(ProjectDir)..\libeXosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz $(ProjectDir)..
" /> <Tool Name="VCCustomBuildTool" @@ -45,11 +46,12 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Description="Downloading EXOSIP." - CommandLine="if not exist $(ProjectDir)..\libosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz $(ProjectDir)..
if not exist $(ProjectDir)..\libeXosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz $(ProjectDir).." + CommandLine="if not exist $(ProjectDir)..\libosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libosip2-2.2.2.tar.gz $(ProjectDir)..
if not exist $(ProjectDir)..\libeXosip2-2.2.2 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libeXosip2-2.2.2.tar.gz $(ProjectDir)..
" /> <Tool Name="VCCustomBuildTool" Modified: freeswitch/trunk/libs/win32/Download HOWL.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download HOWL.vcproj (original) +++ freeswitch/trunk/libs/win32/Download HOWL.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj (original) +++ freeswitch/trunk/libs/win32/Download IKSEMEL.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download LIBSNDFILE.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download PCRE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download PCRE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download PCRE.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj (original) +++ freeswitch/trunk/libs/win32/Download PORTAUDIO.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download SPEEX.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SPEEX.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SPEEX.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SPIDERMONKEY.vcproj Fri Aug 18 03:22:18 2006 @@ -22,11 +22,12 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Description="Downloading SPIDERMONKEY." - CommandLine="if not exist $(ProjectDir)..\js20051231 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.debug cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.release cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip $(ProjectDir).." + CommandLine="if not exist $(ProjectDir)..\js20051231 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.debug cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.release cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip $(ProjectDir)..
" /> <Tool Name="VCCustomBuildTool" @@ -45,11 +46,12 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Description="Downloading SPIDERMONKEY." - CommandLine="if not exist $(ProjectDir)..\js20051231 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.debug cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.release cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip $(ProjectDir).." + CommandLine="if not exist $(ProjectDir)..\js20051231 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/js20051231.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.debug cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.debug.zip $(ProjectDir)..
if not exist $(ProjectDir)..\nspr-4.6.1.winnt5.release cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/nspr-4.6.1.winnt5.release.zip $(ProjectDir)..
" /> <Tool Name="VCCustomBuildTool" Modified: freeswitch/trunk/libs/win32/Download SQLITE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SQLITE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SQLITE.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/Download XMLRPC.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download XMLRPC.vcproj (original) +++ freeswitch/trunk/libs/win32/Download XMLRPC.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/xml.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/xml.vcproj Fri Aug 18 03:22:18 2006 @@ -16,8 +16,8 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\LibR" - IntermediateDirectory=".\LibR" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" @@ -68,7 +68,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\LibR\xml.lib" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -91,8 +91,8 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory=".\LibD" - IntermediateDirectory=".\LibD" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" @@ -141,7 +141,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\LibD\xml.lib" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -370,7 +370,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h" + CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h
" Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h" /> </FileConfiguration> @@ -380,7 +380,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h" + CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h
" Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/howl/libhowl.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/howl/libhowl.vcproj (original) +++ freeswitch/trunk/libs/win32/howl/libhowl.vcproj Fri Aug 18 03:22:18 2006 @@ -17,8 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug Static" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" CharacterSet="2" @@ -49,7 +49,7 @@ UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CallingConvention="2" /> <Tool @@ -83,8 +83,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release Static" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops" CharacterSet="2" Modified: freeswitch/trunk/libs/win32/iksemel/iksemel.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/iksemel/iksemel.vcproj (original) +++ freeswitch/trunk/libs/win32/iksemel/iksemel.vcproj Fri Aug 18 03:22:18 2006 @@ -48,7 +48,7 @@ UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/win32/js/fdlibm.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/js/fdlibm.vcproj (original) +++ freeswitch/trunk/libs/win32/js/fdlibm.vcproj Fri Aug 18 03:22:18 2006 @@ -4,6 +4,7 @@ Version="8.00" Name="fdlibm" ProjectGUID="{76D0A759-9C07-42D4-90A9-82AE15462C95}" + RootNamespace="fdlibm" > <Platforms> <Platform @@ -15,8 +16,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\..\Debug" - IntermediateDirectory=".\..\Debug" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" @@ -62,7 +63,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\..\Debug\fdlibm.lib" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -85,8 +86,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\..\Release" - IntermediateDirectory=".\..\Release" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" @@ -134,7 +135,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\..\Release\fdlibm.lib" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool Modified: freeswitch/trunk/libs/win32/js/js.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/js/js.vcproj (original) +++ freeswitch/trunk/libs/win32/js/js.vcproj Fri Aug 18 03:22:18 2006 @@ -110,7 +110,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D" + CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.release\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D
" /> </Configuration> <Configuration @@ -156,7 +156,7 @@ ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -173,7 +173,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib libnspr4.lib" OutputFile="$(OutDir)\js32.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib" GenerateDebugInformation="true" @@ -207,7 +207,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D" + CommandLine="xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libnspr4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplc4.dll $(OutDir)\ /C /Y /D
xcopy $(ProjectDir)..\..\nspr-4.6.1.winnt5.debug\nspr-4.6.1\lib\libplds4.dll $(OutDir)\ /C /Y /D
" /> </Configuration> </Configurations> Modified: freeswitch/trunk/libs/win32/libresample/libresample.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/libresample/libresample.vcproj (original) +++ freeswitch/trunk/libs/win32/libresample/libresample.vcproj Fri Aug 18 03:22:18 2006 @@ -53,7 +53,7 @@ ProgramDataBaseFileName=".\Debug/" WarningLevel="0" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/win32/libsndfile/libsndfile.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/libsndfile/libsndfile.vcproj (original) +++ freeswitch/trunk/libs/win32/libsndfile/libsndfile.vcproj Fri Aug 18 03:22:18 2006 @@ -49,7 +49,7 @@ UsePrecompiledHeader="0" WarningLevel="1" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="1" /> <Tool Modified: freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj (original) +++ freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj Fri Aug 18 03:22:18 2006 @@ -128,7 +128,7 @@ ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/win32/xmlrpc/Abyss.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/xmlrpc/Abyss.vcproj (original) +++ freeswitch/trunk/libs/win32/xmlrpc/Abyss.vcproj Fri Aug 18 03:22:18 2006 @@ -54,7 +54,7 @@ ProgramDataBaseFileName=".\objs/" WarningLevel="0" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/win32/xmlrpc/xmlrpc.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/xmlrpc/xmlrpc.vcproj (original) +++ freeswitch/trunk/libs/win32/xmlrpc/xmlrpc.vcproj Fri Aug 18 03:22:18 2006 @@ -54,7 +54,7 @@ ProgramDataBaseFileName=".\Debug\xmlrpc/" WarningLevel="0" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -69,7 +69,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\xmlrpcD.lib" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -92,8 +92,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release\xmlrpc" - IntermediateDirectory=".\Release\xmlrpc" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" @@ -146,7 +146,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\xmlrpc.lib" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -218,7 +218,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.vcproj Fri Aug 18 03:22:18 2006 @@ -53,7 +53,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" DisableSpecificWarnings="4201" /> <Tool Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Copied: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj (from r2323, /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj) ============================================================================== --- /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj Fri Aug 18 03:22:18 2006 @@ -52,7 +52,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj Fri Aug 18 03:22:18 2006 @@ -50,7 +50,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Fri Aug 18 03:22:18 2006 @@ -51,7 +51,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/w32/vsnet/FreeSwitchConsole.vcproj ============================================================================== --- freeswitch/trunk/w32/vsnet/FreeSwitchConsole.vcproj (original) +++ freeswitch/trunk/w32/vsnet/FreeSwitchConsole.vcproj Fri Aug 18 03:22:18 2006 @@ -17,11 +17,12 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" + OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -63,7 +64,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/FreeSwitch.exe" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" @@ -98,11 +99,12 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" + OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -141,7 +143,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/FreeSwitch.exe" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" Modified: freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -54,7 +55,7 @@ WarningLevel="4" WarnAsError="true" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" ForcedIncludeFiles="" /> <Tool @@ -115,6 +116,7 @@ ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" Modified: freeswitch/trunk/w32/vsnet/FreeSwitchVersion.vcproj ============================================================================== --- freeswitch/trunk/w32/vsnet/FreeSwitchVersion.vcproj (original) +++ freeswitch/trunk/w32/vsnet/FreeSwitchVersion.vcproj Fri Aug 18 03:22:18 2006 @@ -22,6 +22,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool" @@ -45,6 +46,7 @@ ConfigurationType="10" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool Name="VCPreBuildEventTool"

1 0