March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12497 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mrene Date: Fri Mar 6 22:56:07 2009 New Revision: 12497 Log: Add events and a shutdown function to mod_limit Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Mar 6 22:56:07 2009 @@ -37,8 +37,11 @@ #include <switch_odbc.h> #endif +#define LIMIT_EVENT_USAGE "limit::usage" + SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load); -SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, NULL, NULL); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown); +SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, mod_limit_shutdown, NULL); static struct { switch_memory_pool_t *pool; @@ -291,6 +294,21 @@ return status; } +static void limit_fire_event(const char *realm, const char *key, uint32_t usage, uint32_t rate, uint32_t max, uint32_t ratemax) +{ + switch_event_t *event; + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, LIMIT_EVENT_USAGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "realm", realm); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", key); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "usage", "%d", usage); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rate", "%d", rate); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "max", "%d", max); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ratemax", "%d", ratemax); + switch_event_fire(&event); + } +} + static switch_status_t db_state_handler(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); @@ -792,7 +810,8 @@ limit_execute_sql(sql, NULL); switch_safe_free(sql); - switch_channel_set_variable(channel, "limit_usage", switch_core_session_sprintf(session, "%d", ++got)); + switch_channel_set_variable_printf(channel, "limit_usage", "%d", ++got); + limit_fire_event(realm, id, got, 0, max, 0); done: switch_mutex_unlock(globals.mutex); @@ -954,7 +973,6 @@ if (increment) { item->total_usage++; - switch_core_hash_insert(pvt->hash, hashkey, item); if (max == -1) { @@ -964,6 +982,8 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); } + + limit_fire_event(realm, id, item->total_usage, item->rate_usage, max, max >=0 ? (uint32_t)max : 0); } /* Save current usage & rate into channel variables so it can be used later in the dialplan, or added to CDR records */ @@ -1036,6 +1056,13 @@ gethostname(globals.hostname, sizeof(globals.hostname)); globals.pool = pool; + + if (switch_event_reserve_subclass(LIMIT_EVENT_USAGE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldnt register event subclass \"%s\"", + LIMIT_EVENT_USAGE); + return SWITCH_STATUS_FALSE; + } + if ((status = do_config() != SWITCH_STATUS_SUCCESS)) { return status; } @@ -1048,6 +1075,8 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "limit_hash", "Limit (hash)", LIMITHASH_DESC, limit_hash_function, LIMITHASH_USAGE, SAF_SUPPORT_NOMEDIA); @@ -1074,6 +1103,23 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown) +{ + switch_event_free_subclass(LIMIT_EVENT_USAGE); + + switch_xml_config_cleanup(config_settings); + + switch_mutex_destroy(globals.mutex); + switch_mutex_destroy(globals.limit_hash_mutex); + switch_mutex_destroy(globals.db_hash_mutex); + + switch_core_hash_destroy(&globals.limit_hash); + switch_core_hash_destroy(&globals.db_hash); + + return SWITCH_STATUS_SUCCESS; +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r12496 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mrene Date: Fri Mar 6 20:55:52 2009 New Revision: 12496 Log: update regex Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Mar 6 20:55:52 2009 @@ -166,7 +166,7 @@ return ret; } -static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "\\w+:\\w+:\\w+" }; +static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "(.+?):(.+?):(.+)" }; static switch_xml_config_item_t config_settings[] = { SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn,

1 0

[commit] r12495 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: anthm Date: Fri Mar 6 20:20:29 2009 New Revision: 12495 Log: performance tuning Modified: freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Mar 6 20:20:29 2009 @@ -37,6 +37,12 @@ #define _XOPEN_SOURCE 600 #endif +#ifndef WIN32 +#ifdef HAVE_SETRLIMIT +#include <sys/resource.h> +#endif +#endif + #include <switch.h> #include "private/switch_core_pvt.h" @@ -274,6 +280,10 @@ switch_status_t destroy_status; switch_file_t *fd; switch_memory_pool_t *pool = NULL; +#ifdef HAVE_SETRLIMIT + struct rlimit rlp; + int waste = 0; +#endif if (argv[0] && strstr(argv[0], "freeswitchd")) { nc++; @@ -291,6 +301,7 @@ #endif "\t-help -- this message\n" #ifdef HAVE_SETRLIMIT + "\t-waste -- allow memory waste\n" "\t-core -- dump cores\n" #endif "\t-hp -- enable high priority settings\n" @@ -374,6 +385,7 @@ exit(0); } } + if (argv[x] && !strcmp(argv[x], "-uninstall")) { x++; if (argv[x] && strlen(argv[x])) { @@ -429,13 +441,17 @@ #endif #ifdef HAVE_SETRLIMIT if (argv[x] && !strcmp(argv[x], "-core")) { - struct rlimit rlp; memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = RLIM_INFINITY; rlp.rlim_max = RLIM_INFINITY; setrlimit(RLIMIT_CORE, &rlp); known_opt++; } + + if (argv[x] && !strcmp(argv[x], "-waste")) { + waste++; + known_opt++; + } #endif if (argv[x] && !strcmp(argv[x], "-hp")) { @@ -600,12 +616,32 @@ #endif } +#ifdef HAVE_SETRLIMIT + if (!waste) { + memset(&rlp, 0, sizeof(rlp)); + getrlimit(RLIMIT_STACK, &rlp); + if (rlp.rlim_max > SWITCH_THREAD_STACKSIZE) { + memset(&rlp, 0, sizeof(rlp)); + rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_THREAD_STACKSIZE; + setrlimit(RLIMIT_STACK, &rlp); + fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance....\n", + SWITCH_THREAD_STACKSIZE / 1024, SWITCH_THREAD_STACKSIZE / 1024, argv[0]); + return (int)execv(argv[0], argv); + } + } +#endif + + + + if (high_prio) { set_high_priority(); } switch_core_setrlimits(); + #ifndef WIN32 if (runas_user || runas_group) { if (change_user_group(runas_user, runas_group) < 0) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Mar 6 20:20:29 2009 @@ -792,7 +792,7 @@ #ifndef __FreeBSD__ memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlp.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + rlp.rlim_max = SWITCH_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); #endif @@ -808,6 +808,8 @@ setrlimit(RLIMIT_CPU, &rlp); setrlimit(RLIMIT_DATA, &rlp); setrlimit(RLIMIT_FSIZE, &rlp); + setrlimit(RLIMIT_NPROC, &rlp); + setrlimit(RLIMIT_RTPRIO, &rlp); #if !defined(__OpenBSD__) && !defined(__NetBSD__) setrlimit(RLIMIT_AS, &rlp); #endif @@ -1632,6 +1634,15 @@ switch_threadattr_detach_set(thd_attr, 1); switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); + +#if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) + rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_THREAD_STACKSIZE; + if (setrlimit(RLIMIT_STACK, &rlim) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); + } +#endif + if (wait) { switch_thread_cond_wait(sth->cond, sth->mutex); ret = sth->ret;

1 0

[commit] r12494 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mrene Date: Fri Mar 6 20:13:32 2009 New Revision: 12494 Log: Implement new config parser in mod_limit Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Mar 6 20:13:32 2009 @@ -166,45 +166,42 @@ return ret; } +static switch_xml_config_string_options_t limit_config_dsn = { NULL, 0, "\\w+:\\w+:\\w+" }; + +static switch_xml_config_item_t config_settings[] = { + SWITCH_CONFIG_ITEM("odbc-dsn", SWITCH_CONFIG_STRING, 0, &globals.odbc_dsn, NULL, &limit_config_dsn, + "dsn:username:password", "If set, the ODBC DSN used by the limit and db applications"), + SWITCH_CONFIG_ITEM_END() +}; + static switch_status_t do_config() { - char *cf = "limit.conf"; - switch_xml_t cfg, xml, settings, param; switch_core_db_t *db; switch_status_t status = SWITCH_STATUS_SUCCESS; char *odbc_user = NULL; char *odbc_pass = NULL; char *sql = NULL; + + limit_config_dsn.pool = globals.pool; - if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + if (switch_xml_config_parse_module_settings("limit.conf", SWITCH_FALSE, config_settings) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; } - - if ((settings = switch_xml_child(cfg, "settings"))) { - for (param = switch_xml_child(settings, "param"); param; param = param->next) { - char *var = NULL; - char *val = NULL; - - var = (char *) switch_xml_attr_soft(param, "name"); - val = (char *) switch_xml_attr_soft(param, "value"); - - if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { + + if (globals.odbc_dsn) { #ifdef SWITCH_HAVE_ODBC - globals.odbc_dsn = switch_core_strdup(globals.pool, val); - if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { - *odbc_user++ = '\0'; - if ((odbc_pass = strchr(odbc_user, ':'))) { - *odbc_pass++ = '\0'; - } - } -#else - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); -#endif + if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; } } +#else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); +#endif } + if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) { globals.dbname = "call_limit"; } @@ -291,8 +288,6 @@ limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); - switch_xml_free(xml); - return status; }

1 0

[commit] r12493 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mrene Date: Fri Mar 6 20:11:16 2009 New Revision: 12493 Log: Enhance generic configuration parser Modified: freeswitch/trunk/src/include/switch_xml_config.h freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/include/switch_xml_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml_config.h (original) +++ freeswitch/trunk/src/include/switch_xml_config.h Fri Mar 6 20:11:16 2009 @@ -94,12 +94,35 @@ void *defaultvalue; /*< Default value */ void *data; /*< Custom data (depending on the type) */ switch_xml_config_callback_t function; /*< Callback to be called after the var is parsed */ + char *syntax; /*< Optional syntax documentation for this setting */ + char *helptext; /*< Optional documentation text for this setting */ }; -#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data) { _key, _type, _flags, _ptr, _defaultvalue, _data, NULL } -#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue) { _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL } -#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata) { _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data } -#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL } +#define SWITCH_CONFIG_ITEM(_key, _type, _flags, _ptr, _defaultvalue, _data, _syntax, _helptext) { _key, _type, _flags, _ptr, _defaultvalue, _data, NULL, _syntax, _helptext } +#define SWITCH_CONFIG_ITEM_STRING_STRDUP(_key, _flags, _ptr, _defaultvalue, _syntax, _helptext) { _key, SWITCH_CONFIG_STRING, _flags, _ptr, _defaultvalue, &switch_config_string_strdup, NULL, _helptext} +#define SWITCH_CONFIG_ITEM_CALLBACK(_key, _type, _flags, _ptr, _defaultvalue, _data, _functiondata, _syntax, _helptext) { _key, _type, _flags, _ptr, _defaultvalue, _functiondata, _data, _helptext} +#define SWITCH_CONFIG_ITEM_END() { NULL, SWITCH_CONFIG_LAST, 0, NULL ,NULL, NULL, NULL, NULL, NULL } + +/*! + * \brief Gets the int representation of an enum + * \param enum_options the switch_xml_config_enum_item_t array for this enum + * \param value string value to search + */ +SWITCH_DECLARE(switch_status_t) switch_xml_config_enum_str2int(switch_xml_config_enum_item_t *enum_options, const char *value, int *out); + +/*! + * \brief Gets the string representation of an enum + * \param enum_options the switch_xml_config_enum_item_t array for this enum + * \param value int value to search + */ +SWITCH_DECLARE(const char*) switch_xml_config_enum_int2str(switch_xml_config_enum_item_t *enum_options, int value); + +/*! + * \brief Prints out an item's documentation on the console + * \param level loglevel to use + * \param item item which the doc should be printed + */ +SWITCH_DECLARE(void) switch_xml_config_item_print_doc(int level, switch_xml_config_item_t *item); /*! * \brief Parses all the xml elements, following a ruleset defined by an array of switch_xml_config_item_t @@ -108,7 +131,15 @@ * \param instructions instrutions on how to parse the elements * \see switch_xml_config_item_t */ -SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions); +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, switch_bool_t reload, switch_xml_config_item_t *instructions); + +/*! + * \brief Parses a module's settings + * \param reload true to skip all non-reloadable options + * \param file the configuration file to look for + * \param instructions the instructions + */ +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_module_settings(const char *file, switch_bool_t reload, switch_xml_config_item_t *instructions); /*! * \brief Parses all of an event's elements, following a ruleset defined by an array of switch_xml_config_item_t @@ -117,7 +148,7 @@ * \param instructions instrutions on how to parse the elements * \see switch_xml_config_item_t */ -SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions); +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, switch_bool_t reload, switch_xml_config_item_t *instructions); /*! * \brief Parses a list of xml elements into an event @@ -128,12 +159,12 @@ */ SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event); - /*! * \brief Free any memory allocated by the configuration * \param instructions instrutions on how to parse the elements */ SWITCH_DECLARE(void) switch_xml_config_cleanup(switch_xml_config_item_t *instructions); + #endif /* !defined(SWITCH_XML_CONFIG_H) */ /* For Emacs: Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Fri Mar 6 20:11:16 2009 @@ -34,6 +34,17 @@ SWITCH_DECLARE_DATA switch_xml_config_string_options_t switch_config_string_strdup = { NULL, 0, NULL }; +static switch_xml_config_enum_item_t switch_config_types_enum[] = { + {"int", SWITCH_CONFIG_INT }, + {"string", SWITCH_CONFIG_STRING }, + {"bool", SWITCH_CONFIG_BOOL }, + {"custom", SWITCH_CONFIG_CUSTOM }, + {"enum", SWITCH_CONFIG_ENUM }, + {"flag", SWITCH_CONFIG_FLAG }, + {"flagarray",SWITCH_CONFIG_FLAGARRAY}, + { NULL, 0 } +}; + SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const char *keyname, const char *valuename, switch_event_t **event) { switch_xml_t node; @@ -57,7 +68,35 @@ return count; } -SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions) +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_module_settings(const char *file, switch_bool_t reload, switch_xml_config_item_t *instructions) +{ + switch_xml_t cfg, xml, settings; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (!(xml = switch_xml_open_cfg(file, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not open %s\n", file); + return SWITCH_STATUS_FALSE; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + status = switch_xml_config_parse(switch_xml_child(settings, "param"), reload, instructions); + } + + switch_xml_free(xml); + + return status; +} + +SWITCH_DECLARE(void) switch_xml_config_item_print_doc(int level, switch_xml_config_item_t *item) +{ + if (item->syntax && item->helptext) { + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, level, "Item name: [%s]\nType: %s (%s)\nSyntax: %s\nHelp: %s\n\n", + item->key, switch_xml_config_enum_int2str(switch_config_types_enum, item->type), + switch_test_flag(item, CONFIG_REQUIRED) ? "required" : "optional", item->syntax, item->helptext); + } +} + +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, switch_bool_t reload, switch_xml_config_item_t *instructions) { switch_event_t *event = NULL; switch_status_t result; @@ -72,7 +111,29 @@ return result; } -SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, int reload, switch_xml_config_item_t *instructions) +SWITCH_DECLARE(switch_status_t) switch_xml_config_enum_str2int(switch_xml_config_enum_item_t *enum_options, const char *value, int *out) +{ + for (;enum_options->key; enum_options++) { + if (!strcasecmp(value, enum_options->key)) { + *out = enum_options->value; + return SWITCH_STATUS_SUCCESS; + } + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(const char*) switch_xml_config_enum_int2str(switch_xml_config_enum_item_t *enum_options, int value) +{ + for (;enum_options->key; enum_options++) { + if (value == enum_options->value) { + return enum_options->key; + } + } + return NULL; +} + +SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *event, int count, switch_bool_t reload, switch_xml_config_item_t *instructions) { switch_xml_config_item_t *item; int matched_count = 0; @@ -142,9 +203,9 @@ const char *newstring = NULL; if (!string_options) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Missing mandatory switch_xml_config_string_options_t structure for parameter [%s], skipping!\n", item->key); - continue; + return SWITCH_STATUS_FALSE; } /* Perform validation */ @@ -155,7 +216,8 @@ } else { newstring = (char*)item->defaultvalue; /* Regex failed */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", - value, item->key, newstring); + value, item->key, newstring ? newstring : "(null)"); + switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item); } } else { newstring = value; /* No validation */ @@ -204,6 +266,7 @@ newval = (switch_bool_t)(intptr_t)item->defaultvalue; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", value, item->key, newval ? "true" : "false"); + switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item); } else { newval = (switch_bool_t)(intptr_t)item->defaultvalue; } @@ -221,21 +284,18 @@ switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data; int *dest = (int*)item->ptr; int newval = 0; + switch_status_t lookup_result; if (value) { - for (;enum_options->key; enum_options++) { - if (!strcasecmp(value, enum_options->key)) { - newval = enum_options->value; - break; - } - } + lookup_result = switch_xml_config_enum_str2int(enum_options, value, &newval); } else { newval = (int)(intptr_t)item->defaultvalue; } - if (!enum_options->key) { /* if (!found) */ + if (value != SWITCH_STATUS_SUCCESS) { newval = (int)(intptr_t)item->defaultvalue; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key); + switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item); } if (*dest != newval) {

1 0

[commit] r12492 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: mikej Date: Fri Mar 6 16:28:32 2009 New Revision: 12492 Log: build: fix rebuild every time on msvc 2008 non team editions (FSBUILD-132) Modified: freeswitch/trunk/w32/Library/ (props changed) freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Fri Mar 6 16:28:32 2009 @@ -30,7 +30,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" /> <Tool Name="VCCustomBuildTool" @@ -60,7 +60,7 @@ WarnAsError="true" DebugInformationFormat="3" ForcedIncludeFiles="" - EnablePREfast="true" + EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -79,7 +79,7 @@ AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" AddModuleNamesToAssembly="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(SolutionDir)$(OutDir)/FreeSwitch.pdb" + ProgramDatabaseFile="$(OutDir)/FreeSwitch.pdb" SubSystem="2" OptimizeReferences="0" EnableCOMDATFolding="0" @@ -122,7 +122,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" /> <Tool Name="VCCustomBuildTool" @@ -153,7 +153,7 @@ WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" - EnablePREfast="true" + EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -172,7 +172,7 @@ AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" AddModuleNamesToAssembly="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(SolutionDir)$(OutDir)/FreeSwitch.pdb" + ProgramDatabaseFile="$(OutDir)/FreeSwitch.pdb" SubSystem="2" OptimizeReferences="0" EnableCOMDATFolding="0" @@ -215,7 +215,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" /> <Tool Name="VCCustomBuildTool" @@ -242,6 +242,7 @@ WarningLevel="4" WarnAsError="true" DebugInformationFormat="3" + EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -302,7 +303,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="echo Testing for Code Analysis support
echo ; > "$(OutDir)\TestAnalysis.c
cl /analyze /nologo /c "$(OutDir)\TestAnalysis.c" | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
exit 0
" /> <Tool Name="VCCustomBuildTool" @@ -330,6 +331,7 @@ WarningLevel="4" WarnAsError="false" DebugInformationFormat="3" + EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -763,46 +765,6 @@ <File RelativePath="..\..\src\switch_xml.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - PrecompiledHeaderFile="" - /> - </FileConfiguration> </File> <File RelativePath="..\..\src\switch_xml_config.c"

1 0

[commit] r12491 - in freeswitch/trunk/src/mod/applications: mod_commands mod_dptools
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 14:16:48 2009 New Revision: 12491 Log: add heartbeat apps Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Mar 6 14:16:48 2009 @@ -2743,7 +2743,7 @@ return SWITCH_STATUS_SUCCESS; } -#define HEARTBEAT_SYNTAX "<uuid> [sched] <on|off|<seconds>>" +#define HEARTBEAT_SYNTAX "<uuid> [sched] [0|<seconds>]" SWITCH_STANDARD_API(uuid_session_heartbeat_function) { char *mycmd = NULL, *argv[3] = { 0 }; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Mar 6 14:16:48 2009 @@ -111,6 +111,42 @@ } } + +#define SCHED_HEARTBEAT_SYNTAX "[0|<seconds>]" +SWITCH_STANDARD_APP(sched_heartbeat_function) +{ + int seconds = 0; + + if (data) { + seconds = atoi(data); + if (seconds >= 0) { + switch_core_session_sched_heartbeat(session, seconds); + return; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SCHED_HEARTBEAT_SYNTAX); + +} + + +#define HEARTBEAT_SYNTAX "[0|<seconds>]" +SWITCH_STANDARD_APP(heartbeat_function) +{ + int seconds = 0; + + if (data) { + seconds = atoi(data); + if (seconds >= 0) { + switch_core_session_enable_heartbeat(session, seconds); + return; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", HEARTBEAT_SYNTAX); + +} + #define EXE_SYNTAX "<extension> <dialplan> <context>" SWITCH_STANDARD_APP(exe_function) { @@ -2605,6 +2641,10 @@ SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "sched_heartbeat", "Enable Scheduled Heartbeat", "Enable Scheduled Heartbeat", + sched_heartbeat_function, SCHED_HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "enable_heartbeat", "Enable Media Heartbeat", "Enable Media Heartbeat", + heartbeat_function, HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "mkdir", "Create a directory", "Create a directory", mkdir_function, MKDIR_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "soft_hold", "Put a bridged channel on hold", "Put a bridged channel on hold", soft_hold_function, SOFT_HOLD_SYNTAX, SAF_NONE);

1 0

06 Mar '09

Author: mikej Date: Fri Mar 6 13:27:14 2009 New Revision: 12490 Log: build: build path cleanups (FSBUILD-130) Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj freeswitch/trunk/w32/modules.vsprops Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="0" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="0" Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="0" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="0" Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -87,8 +87,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -223,8 +221,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -21,8 +21,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="1" @@ -96,8 +94,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="1" @@ -173,8 +169,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="1" @@ -253,8 +247,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="1" Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -345,8 +345,6 @@ </Configuration> <Configuration Name="Debug Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -476,8 +474,6 @@ </Configuration> <Configuration Name="Release Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -347,8 +347,6 @@ </Configuration> <Configuration Name="Debug Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -478,8 +476,6 @@ </Configuration> <Configuration Name="Release Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -349,8 +349,6 @@ </Configuration> <Configuration Name="Debug Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -480,8 +478,6 @@ </Configuration> <Configuration Name="Release Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -212,8 +210,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -212,8 +210,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -359,8 +359,6 @@ </Configuration> <Configuration Name="Debug MS-LDAP|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -497,8 +495,6 @@ </Configuration> <Configuration Name="Release MS-LDAP|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -217,8 +215,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -87,8 +87,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -223,8 +221,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -88,8 +88,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -226,8 +224,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -87,8 +87,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -224,8 +222,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -213,8 +211,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -212,8 +210,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj Fri Mar 6 13:27:14 2009 @@ -20,8 +20,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -93,8 +91,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -168,8 +164,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -244,8 +238,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -217,8 +215,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -86,8 +86,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -220,8 +218,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj Fri Mar 6 13:27:14 2009 @@ -103,8 +103,6 @@ </Configuration> <Configuration Name="Debug_CLR|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -267,8 +265,6 @@ </Configuration> <Configuration Name="Release_CLR|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="1" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -86,8 +86,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -220,8 +218,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -223,8 +221,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="1" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="1" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -221,8 +219,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -88,8 +88,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -221,8 +219,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -213,8 +211,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Fri Mar 6 13:27:14 2009 @@ -3,8 +3,8 @@ ProjectType="Visual C++" Version="8.00" Name="modules" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" InheritedPropertySheets=".\winlibs.vsprops" > <Tool @@ -17,7 +17,7 @@ Name="VCLinkerTool" OutputFile="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb" ImportLibrary="$(OutDir)/$(InputName).lib" /> </VisualStudioPropertySheet>

1 0

[commit] r12489 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 13:25:19 2009 New Revision: 12489 Log: fix broken filter command in event socket Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Mar 6 13:25:19 2009 @@ -254,7 +254,7 @@ send = 0; switch_mutex_lock(l->filter_mutex); - for (hp = l->filters->headers; hp; hp = hp->next) { + for (hp = l->filters->headers; hp; hp = hp->next) { if ((hval = switch_event_get_header(event, hp->name))) { const char *comp_to = hp->value; int pos = 1, cmp = 0; @@ -611,7 +611,8 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } if (!strcasecmp(action, "delete")) { @@ -622,7 +623,8 @@ if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } else { switch_event_del_header(listener->filters, header_val); } @@ -1406,13 +1408,15 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } if (!strcasecmp(header_name, "delete")) { if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } else { switch_event_del_header(listener->filters, header_val); }

1 0

[commit] r12488 - in freeswitch/trunk/libs/esl: lua perl php python ruby src src/include
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 13:24:10 2009 New Revision: 12488 Log: change api to return event on filter command Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/server2.pl freeswitch/trunk/libs/esl/php/ESL.php freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/python/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -2537,7 +2537,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; SWIG_check_num_args("filter",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("filter",1,"ESLconnection *"); @@ -2550,9 +2550,9 @@ arg2 = (char *)lua_tostring(L, 2); arg3 = (char *)lua_tostring(L, 3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); SWIG_arg=0; - lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -3092,7 +3092,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3122,8 +3122,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); - ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; Modified: freeswitch/trunk/libs/esl/perl/server2.pl ============================================================================== --- freeswitch/trunk/libs/esl/perl/server2.pl (original) +++ freeswitch/trunk/libs/esl/perl/server2.pl Fri Mar 6 13:24:10 2009 @@ -26,7 +26,17 @@ printf "Connected call %s, from %s\n", $uuid, $info->getHeader("caller-caller-id-number"); - $con->sendRecv("myevents"); + $e = $con->filter("unique-id", $uuid); + if ($e) { + print $e->serialize(); + } else { + printf("WTF?\n"); + } + + $con->events("plain", "all"); + + + #$con->sendRecv("myevents"); $con->execute("answer"); $con->execute("playback", "/ram/swimp.raw"); Modified: freeswitch/trunk/libs/esl/php/ESL.php ============================================================================== --- freeswitch/trunk/libs/esl/php/ESL.php (original) +++ freeswitch/trunk/libs/esl/php/ESL.php Fri Mar 6 13:24:10 2009 @@ -170,7 +170,8 @@ } function filter($header,$value) { - return ESLconnection_filter($this->_cPtr,$header,$value); + $r=ESLconnection_filter($this->_cPtr,$header,$value); + return is_resource($r) ? new ESLevent($r) : $r; } function events($etype,$value) { Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -2120,7 +2120,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; zval **args[3]; SWIG_ResetError(); @@ -2146,9 +2146,9 @@ arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); { - ZVAL_LONG(return_value,result); + SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0); } return; fail: Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -3956,7 +3956,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3985,8 +3985,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); - resultobj = SWIG_From_int(static_cast< int >(result)); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 ); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return resultobj; Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -3087,7 +3087,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3116,8 +3116,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","filter", 3, argv[1] )); } arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); - vresult = SWIG_From_int(static_cast< int >(result)); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 ); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return vresult; Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Fri Mar 6 13:24:10 2009 @@ -189,9 +189,18 @@ return NULL; } -int ESLconnection::filter(const char *header, const char *value) +ESLevent *ESLconnection::filter(const char *header, const char *value) { - return esl_filter(&handle, header, value); + esl_status_t status = esl_filter(&handle, header, value); + + if (status == ESL_SUCCESS && handle.last_sr_event) { + esl_event_t *event; + esl_event_dup(&event, handle.last_sr_event); + return new ESLevent(event, 1); + } + + return NULL; + } int ESLconnection::events(const char *etype, const char *value) Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Fri Mar 6 13:24:10 2009 @@ -86,7 +86,7 @@ int sendEvent(ESLevent *send_me); ESLevent *recvEvent(); ESLevent *recvEventTimed(int ms); - int filter(const char *header, const char *value); + ESLevent *filter(const char *header, const char *value); int events(const char *etype, const char *value); int execute(const char *app, const char *arg = NULL, const char *uuid = NULL); int setBlockingExecute(const char *val);

1 0