August 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

18 Aug '06

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

1 0

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

18 Aug '06

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

1 0

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

18 Aug '06

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

1 0

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

18 Aug '06

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

1 0

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

18 Aug '06

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

1 0

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

18 Aug '06

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

1 0

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

18 Aug '06

Author: mikej Date: Thu Aug 17 22:21:26 2006 New Revision: 2324 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: cast for possible loss of data. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Aug 17 22:21:26 2006 @@ -1645,7 +1645,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing Payload index %u %s %u\n", y, payloads[x].name, payloads[x].id); tech_pvt->codec_name = tech_pvt->codecs[y]->iananame; tech_pvt->codec_num = tech_pvt->codecs[y]->ianacode; - tech_pvt->r_codec_num = payloads[x].id; + tech_pvt->r_codec_num = (switch_payload_t)(payloads[x].id); if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { do_describe(tech_pvt, 0); }

1 0

[commit] r2323 - in freeswitch/trunk: libs/libdingaling/src src src/include src/mod/codecs/mod_speex src/mod/endpoints/mod_dingaling src/mod/languages/mod_spidermonkey
by Freeswitch SVN 18 Aug '06

18 Aug '06

Author: anthm Date: Thu Aug 17 21:28:50 2006 New Revision: 2323 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_xml.c Log: Upgrade Dingaling to meet new googletalk spec upgrade your client if you have issues. codecs need more work... Expose events into javascript so you can create and fire events and and pick up chat events with chat-enabled clients like googletalk EXAMPLE: session.answer(); e = new Event("custom", "JS::Custom"); e.addHeader("subject", "cool"); e.addBody("hello this is a test"); e.fire; while(session.ready()) { session.execute("sleep", "1000"); event = session.getEvent(); if (event) { str = event.serialize(); // or ("xml") console_log("debug", "Dump Event:\n" + str + "\n"); e = new Event("custom", "JS::Chat"); e.addHeader("works", "yes"); e.addBody("you said: " + event.getBody()); session.sendEvent(e); event.destroy(); } } Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Aug 17 21:28:50 2006 @@ -190,6 +190,11 @@ return session->id; } +void ldl_session_send_msg(ldl_session_t *session, char *subject, char *body) +{ + ldl_handle_send_msg(session->handle, session->them, subject, body); +} + ldl_status ldl_session_destroy(ldl_session_t **session_p) { ldl_session_t *session = *session_p; @@ -277,7 +282,7 @@ while(xml) { char *type = xtype ? xtype : iks_find_attrib(xml, "type"); iks *tag; - + if (type) { if (!strcasecmp(type, "initiate") || !strcasecmp(type, "accept")) { @@ -298,7 +303,7 @@ if (!strcasecmp(iks_name(itag), "payload-type") && session->payload_len < LDL_MAX_PAYLOADS) { char *name = iks_find_attrib(itag, "name"); char *id = iks_find_attrib(itag, "id"); - char *rate = iks_find_attrib(itag, "rate"); + char *rate = iks_find_attrib(itag, "clockrate"); if (name && id) { session->payloads[session->payload_len].name = apr_pstrdup(session->pool, name); session->payloads[session->payload_len].id = atoi(id); @@ -317,10 +322,15 @@ } tag = iks_next_tag(tag); } - } else if (!strcasecmp(type, "candidates")) { + } else if (!strcasecmp(type, "transport-info")) { + char *tid = iks_find_attrib(xml, "id"); signal = LDL_SIGNAL_CANDIDATES; tag = iks_child (xml); + if (tag && !strcasecmp(iks_name(tag), "transport")) { + tag = iks_child(tag); + } + while(tag) { if (!strcasecmp(iks_name(tag), "info_element")) { char *name = iks_find_attrib(tag, "name"); @@ -354,6 +364,11 @@ } session->candidates[index].pref = pref; + + if (tid) { + session->candidates[index].tid = apr_pstrdup(session->pool, tid); + } + if ((key = iks_find_attrib(tag, "name"))) { session->candidates[index].name = apr_pstrdup(session->pool, key); } @@ -427,8 +442,8 @@ struct ldl_buffer *buffer; size_t x; - iks *msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); - apr_queue_push(handle->queue, msg); + //iks *msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); + //apr_queue_push(handle->queue, msg); apr_cpystrn(id, from, sizeof(id)); @@ -1087,6 +1102,31 @@ return session->private_data; } +void ldl_session_accept_candidate(ldl_session_t *session, ldl_candidate_t *candidate) +{ + iks *iq, *sess, *tp; + unsigned int myid; + char idbuf[80]; + myid = next_id(); + snprintf(idbuf, sizeof(idbuf), "%u", myid); + + iq = iks_new("iq"); + iks_insert_attrib(iq, "type", "set"); + iks_insert_attrib(iq, "id", idbuf); + iks_insert_attrib(iq, "from", session->handle->login); + iks_insert_attrib(iq, "to", session->them); + sess = iks_insert (iq, "session"); + iks_insert_attrib(sess, "xmlns", "http://www.google.com/session"); + iks_insert_attrib(sess, "type", "transport-accept"); + iks_insert_attrib(sess, "id", candidate->tid); + iks_insert_attrib(sess, "xmlns", "http://www.google.com/session"); + iks_insert_attrib(sess, "initiator", session->initiator ? session->initiator : session->them); + tp = iks_insert (sess, "transport"); + iks_insert_attrib(tp, "xmlns", "http://www.google.com/transport/p2p"); + + apr_queue_push(session->handle->queue, iq); +} + void *ldl_handle_get_private(ldl_handle_t *handle) { return handle->private_info; @@ -1128,18 +1168,27 @@ } + unsigned int ldl_session_candidates(ldl_session_t *session, - ldl_candidate_t *candidates, - unsigned int clen) + ldl_candidate_t *candidates, + unsigned int clen) { iks *iq, *sess, *tag; unsigned int x, id; - new_session_iq(session, &iq, &sess, &id, "candidates"); + for (x = 0; x < clen; x++) { char buf[512]; - tag = iks_insert(sess, "candidate"); + iq = NULL; + sess = NULL; + id = 0; + + new_session_iq(session, &iq, &sess, &id, "transport-info"); + tag = iks_insert(sess, "transport"); + iks_insert_attrib(tag, "xmlns", "http://www.google.com/transport/p2p"); + tag = iks_insert(tag, "candidate"); + if (candidates[x].name) { iks_insert_attrib(tag, "name", candidates[x].name); } @@ -1169,13 +1218,13 @@ iks_insert_attrib(tag, "network", "0"); iks_insert_attrib(tag, "generation", "0"); + schedule_packet(session->handle, id, iq, LDL_RETRY); } - schedule_packet(session->handle, id, iq, LDL_RETRY); + return id; } - char *ldl_handle_probe(ldl_handle_t *handle, char *id, char *buf, unsigned int len) { iks *pres, *msg; @@ -1232,13 +1281,14 @@ unsigned int plen, ldl_description_t description) { - iks *iq, *sess, *tag, *payload; + iks *iq, *sess, *tag, *payload, *tp; unsigned int x, id; new_session_iq(session, &iq, &sess, &id, description == LDL_DESCRIPTION_ACCEPT ? "accept" : "initiate"); tag = iks_insert(sess, "description"); iks_insert_attrib(tag, "xmlns", "http://www.google.com/session/phone"); + iks_insert_attrib(tag, "xml:lang", "en"); for (x = 0; x < plen; x++) { char idbuf[80]; payload = iks_insert(tag, "payload-type"); @@ -1249,10 +1299,19 @@ iks_insert_attrib(payload, "name", payloads[x].name); if (payloads[x].rate) { sprintf(idbuf, "%d", payloads[x].rate); - iks_insert_attrib(payload, "rate", idbuf); + iks_insert_attrib(payload, "clockrate", idbuf); } + if (payloads[x].bps) { + sprintf(idbuf, "%d", payloads[x].bps); + iks_insert_attrib(payload, "bitrate", idbuf); + } } + if (description == LDL_DESCRIPTION_INITIATE) { + tp = iks_insert (sess, "transport"); + iks_insert_attrib(tp, "xmlns", "http://www.google.com/transport/p2p"); + } + schedule_packet(session->handle, id, iq, LDL_RETRY); return id; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Thu Aug 17 21:28:50 2006 @@ -53,6 +53,8 @@ /*! \brief A structure to store a jingle candidate */ struct ldl_candidate { + /*! the transport id of the candidate */ + char *tid; /*! the name of the candidate */ char *name; /*! the type of the candidate */ @@ -80,6 +82,8 @@ unsigned int id; /*! the transfer rate of the payload type */ unsigned int rate; + /*! the bits per second of the payload type */ + unsigned int bps; }; typedef struct ldl_payload ldl_payload_t; @@ -287,6 +291,13 @@ void *ldl_session_get_private(ldl_session_t *session); /*! + \brief Accept a candidate + \param session the session to accept on + \param candidate the candidate to accept +*/ +void ldl_session_accept_candidate(ldl_session_t *session, ldl_candidate_t *candidate); + +/*! \brief Set a custom logger \param logger the logger function */ @@ -316,6 +327,14 @@ */ void *ldl_handle_get_private(ldl_handle_t *handle); +/*! + \brief Send a message to a session + \param session the session handle + \param to the message recipiant + \param subject optional subject + \param body body of the message +*/ +void ldl_session_send_msg(ldl_session_t *session, char *subject, char *body); /*! \brief Send a message Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Aug 17 21:28:50 2006 @@ -443,6 +443,14 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_event(switch_core_session_t *session, switch_event_t **event); + +/*! + \brief Indicate the number of waiting events on a session + \param session the session to check + \return the number of events +*/ +SWITCH_DECLARE(int32_t) switch_core_session_event_count(switch_core_session_t *session); + /*! \brief DE-Queue an event on a given session \param session the session to de-queue the message on Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Thu Aug 17 21:28:50 2006 @@ -156,6 +156,13 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name); /*! + \brief Retrieve the body value from an event + \param event the event to read the body from + \return the value of the body or NULL +*/ +SWITCH_DECLARE(char *) switch_event_get_body(switch_event_t *event); + +/*! \brief Add a header to an event \param event the event to add the header to \param stack the stack sense (stack it on the top or on the bottom) Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Thu Aug 17 21:28:50 2006 @@ -271,7 +271,7 @@ /*.ianacode */ 102, /*.iananame */ "speex", /*.samples_per_second */ 32000, - /*.bits_per_second */ 512000, + /*.bits_per_second */ 256000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 640, /*.bytes_per_frame */ 1280, @@ -289,8 +289,8 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 100, /*.iananame */ "speex", - /*.samples_per_second */ 16000, - /*.bits_per_second */ 256000, + /*.samples_per_second */ 22000, + /*.bits_per_second */ 128000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 320, /*.bytes_per_frame */ 640, @@ -310,11 +310,11 @@ /*.ianacode */ 97, /*.iananame */ "speex", /*.samples_per_second */ 8000, - /*.bits_per_second */ 128000, + /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 160, /*.bytes_per_frame */ 320, - /*.encoded_bytes_per_frame */ 0, + /*.encoded_bytes_per_frame */ 28, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Aug 17 21:28:50 2006 @@ -134,6 +134,7 @@ uint32_t last_read; char *codec_name; switch_payload_t codec_num; + switch_payload_t r_codec_num; switch_time_t next_desc; switch_time_t next_cand; char *stun_ip; @@ -244,7 +245,7 @@ switch_rtp_flag_t flags; if (tech_pvt->rtp_session) { - return 0; + return 1; } if (!strncasecmp(tech_pvt->codec_name, "ilbc", 4)) { @@ -260,7 +261,7 @@ NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't load codec?\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return -1; + return 0; } tech_pvt->read_frame.rate = tech_pvt->read_codec.implementation->samples_per_second; tech_pvt->read_frame.codec = &tech_pvt->read_codec; @@ -276,7 +277,7 @@ NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't load codec?\n"); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return -1; + return 0; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Write Codec to %s\n", tech_pvt->codec_name); @@ -287,6 +288,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); flags = SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ; + //flags = SWITCH_RTP_FLAG_AUTOADJ; if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { flags |= SWITCH_RTP_FLAG_USE_TIMER; @@ -304,7 +306,7 @@ &err, switch_core_session_get_pool(tech_pvt->session)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP ERROR %s\n", err); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return -1; + return 0; } else { uint8_t vad_in = switch_test_flag(tech_pvt, TFLAG_VAD_IN) ? 1 : 0; uint8_t vad_out = switch_test_flag(tech_pvt, TFLAG_VAD_OUT) ? 1 : 0; @@ -316,7 +318,7 @@ } } - return 0; + return 1; } @@ -444,18 +446,23 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Don't have my codec yet here's one\n"); tech_pvt->codec_name = lame(tech_pvt->codecs[0]->iananame); tech_pvt->codec_num = tech_pvt->codecs[0]->ianacode; + tech_pvt->r_codec_num = tech_pvt->codecs[0]->ianacode; tech_pvt->codec_index = 0; payloads[0].name = lame(tech_pvt->codecs[0]->iananame); payloads[0].id = tech_pvt->codecs[0]->ianacode; + payloads[0].rate = tech_pvt->codecs[0]->samples_per_second; + payloads[0].bps = tech_pvt->codecs[0]->bits_per_second; } else { payloads[0].name = lame(tech_pvt->codecs[tech_pvt->codec_index]->iananame); payloads[0].id = tech_pvt->codecs[tech_pvt->codec_index]->ianacode; + payloads[0].rate = tech_pvt->codecs[0]->samples_per_second; + payloads[0].bps = tech_pvt->codecs[0]->bits_per_second; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Describe [%s]\n", payloads[0].name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Describe [%s@%d]\n", payloads[0].name, payloads[0].rate); tech_pvt->desc_id = ldl_session_describe(tech_pvt->dlsession, payloads, 1, switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? LDL_DESCRIPTION_INITIATE : LDL_DESCRIPTION_ACCEPT); switch_set_flag_locked(tech_pvt, TFLAG_CODEC_READY); @@ -499,7 +506,7 @@ elapsed = (unsigned int)((now - started) / 1000); if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { - return NULL; + goto out; } @@ -528,10 +535,12 @@ } if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { - return NULL; + goto out; } - activate_rtp(tech_pvt); + if (!activate_rtp(tech_pvt)) { + goto out; + } if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { do_candidates(tech_pvt, 0); @@ -542,6 +551,13 @@ } switch_channel_set_state(channel, CS_INIT); return NULL; + + out: + if (!switch_core_session_runing(tech_pvt->session)) { + channel_on_hangup(tech_pvt->session); + switch_core_session_destroy(&tech_pvt->session); + } + return NULL; } @@ -920,6 +936,33 @@ return SWITCH_STATUS_SUCCESS; } + +static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event) +{ + switch_channel_t *channel; + struct private_object *tech_pvt; + char *subject, *body; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + + if (!(body = switch_event_get_body(event))) { + body = ""; + } + + if (!(subject = switch_event_get_header(event, "subject"))) { + subject = "None"; + } + + ldl_session_send_msg(tech_pvt->dlsession, subject, body); + + return SWITCH_STATUS_SUCCESS; +} + static const switch_state_handler_table_t channel_event_handlers = { /*.on_init */ channel_on_init, /*.on_ring */ channel_on_ring, @@ -938,7 +981,8 @@ /*.waitfor_read */ channel_waitfor_read, /*.waitfor_write */ channel_waitfor_write, /*.send_dtmf */ channel_send_dtmf, - /*.receive_message*/ channel_receive_message + /*.receive_message*/ channel_receive_message, + /*.receive_event*/ channel_receive_event }; static const switch_endpoint_interface_t channel_endpoint_interface = { @@ -1531,7 +1575,9 @@ if (*msg == '+') { switch_channel_queue_dtmf(channel, msg + 1); switch_set_flag_locked(tech_pvt, TFLAG_DTMF); - switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); + if (tech_pvt->rtp_session) { + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); + } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "SESSION MSG [%s]\n", msg); } @@ -1594,11 +1640,12 @@ match = (payloads[x].id == tech_pvt->codecs[y]->ianacode) ? 1 : 0; } - if (match) { + if (match && payloads[x].rate == tech_pvt->codecs[y]->samples_per_second) { tech_pvt->codec_index = y; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing Payload index %u %s %u\n", y, payloads[x].name, payloads[x].id); tech_pvt->codec_name = tech_pvt->codecs[y]->iananame; tech_pvt->codec_num = tech_pvt->codecs[y]->ianacode; + tech_pvt->r_codec_num = payloads[x].id; if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { do_describe(tech_pvt, 0); } @@ -1663,8 +1710,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Acceptable Candidate %s:%d\n", candidates[x].address, candidates[x].port); + if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + ldl_session_accept_candidate(dlsession, &candidates[x]); + } - if (!(exten = ldl_session_get_value(dlsession, "dnis"))) { exten = profile->exten; } @@ -1719,10 +1768,13 @@ ldl_session_set_ip(dlsession, tech_pvt->remote_ip); tech_pvt->remote_port = candidates[x].port; tech_pvt->remote_user = switch_core_session_strdup(session, candidates[x].username); + if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { do_candidates(tech_pvt, 0); } + + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT); return LDL_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Aug 17 21:28:50 2006 @@ -149,6 +149,262 @@ }; +/* Event Object */ +/*********************************************************************************/ +static JSBool event_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + if (argc > 0) { + switch_event_t *event; + switch_event_types_t etype; + char *ename = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + + if (switch_name_event(ename, &etype) != SWITCH_STATUS_SUCCESS) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (etype == SWITCH_EVENT_CUSTOM) { + char *subclass_name; + if (argc < 1) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + subclass_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + if (switch_event_create_subclass(&event, etype, subclass_name) != SWITCH_STATUS_SUCCESS) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + } else { + if (!switch_event_create(&event, etype) != SWITCH_STATUS_SUCCESS) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + } + + JS_SetPrivate(cx, obj, event); + return JS_TRUE; + } + + return JS_FALSE; +} + +static void event_destroy(JSContext *cx, JSObject *obj) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (event) { + switch_event_destroy(&event); + } +} + +static JSBool event_add_header(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (!event) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 1) { + char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + char *hval = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, hname, hval); + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; +} + +static JSBool event_get_header(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (!event) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 0) { + char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + char *val = switch_event_get_header(event, hname); + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, val)); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; +} + +static JSBool event_add_body(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (!event) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 0) { + char *body = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + switch_event_add_body(event, body); + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; +} + +static JSBool event_get_body(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (!event) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, switch_event_get_body(event))); + + return JS_TRUE; +} + +static JSBool event_serialize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + char buf[1024]; + uint8_t isxml = 0; + + if (!event) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + if (argc > 0) { + char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + if (!strcasecmp(arg, "xml")) { + isxml++; + } + } + + if (isxml) { + switch_xml_t xml; + char *xmlstr; + if ((xml = switch_event_xmlize(event, NULL))) { + xmlstr = switch_xml_toxml(xml); + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, xmlstr)); + switch_xml_free(xml); + free(xmlstr); + } else { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + } + } else { + switch_event_serialize(event, buf, sizeof(buf), NULL); + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, buf)); + } + + return JS_TRUE; +} + +static JSBool event_fire(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (event) { + switch_event_fire(&event); + JS_SetPrivate(cx, obj, NULL); + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; +} + +static JSBool event_destroy_(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + switch_event_t *event = JS_GetPrivate(cx, obj); + + if (event) { + switch_event_destroy(&event); + JS_SetPrivate(cx, obj, NULL); + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; +} + + + +enum event_tinyid { + EVENT_READY +}; + +static JSFunctionSpec event_methods[] = { + {"addHeader", event_add_header, 1}, + {"getHeader", event_get_header, 1}, + {"addBody", event_add_body, 1}, + {"getBody", event_get_body, 1}, + {"serialize", event_serialize, 0}, + {"fire", event_fire, 0}, + {"destroy", event_destroy_, 0}, + {0} +}; + + +static JSPropertySpec event_props[] = { + {"ready", EVENT_READY, JSPROP_READONLY|JSPROP_PERMANENT}, + {0} +}; + + +static JSBool event_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) +{ + JSBool res = JS_TRUE; + switch_event_t *event = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + if (!event) { + *vp = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + + name = JS_GetStringBytes(JS_ValueToString(cx, id)); + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } + + switch(param) { + case EVENT_READY: + *vp = BOOLEAN_TO_JSVAL( JS_TRUE ); + break; + } + + return res; +} + +JSClass event_class = { + "Event", JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, event_getProperty, JS_PropertyStub, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, event_destroy, NULL, NULL, NULL, + event_construct +}; + + + + static void js_error(JSContext *cx, const char *message, JSErrorReport *report) { if (message) { @@ -681,7 +937,53 @@ return JS_TRUE; } +static JSBool session_get_event(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_event_t *event; + if (switch_core_session_dequeue_event(jss->session, &event) == SWITCH_STATUS_SUCCESS) { + JSObject *Event; + if ((Event = JS_DefineObject(cx, obj, "Event", &event_class, NULL, 0))) { + if ((JS_SetPrivate(cx, Event, event) && + JS_DefineProperties(cx, Event, event_props) && + JS_DefineFunctions(cx, Event, event_methods))) { + *rval = OBJECT_TO_JSVAL ( Event ); + return JS_TRUE; + } + } + } + + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + +} + +static JSBool session_send_event(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_event_t *event; + JSObject *Event; + + if (argc > 0) { + if (JS_ValueToObject(cx, argv[0], &Event)) { + if ((event = JS_GetPrivate(cx, Event))) { + if (switch_core_session_receive_event(jss->session, &event) != SWITCH_STATUS_SUCCESS) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + + JS_SetPrivate(cx, Event, NULL); + } + } + } + + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + return JS_TRUE; + +} + + static JSBool session_hangup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -845,6 +1147,7 @@ } #endif + /* Session Object */ /*********************************************************************************/ enum session_tinyid { @@ -860,6 +1163,8 @@ {"answer", session_answer, 0}, {"ready", session_ready, 0}, {"waitForAnswer", session_wait_for_answer, 0}, + {"getEvent", session_get_event, 0}, + {"sendEvent", session_send_event, 0}, {"hangup", session_hangup, 0}, {"execute", session_execute, 0}, {0} @@ -2124,6 +2429,18 @@ db_methods, db_props, db_methods + ); + + JS_InitClass(cx, + javascript_object, + NULL, + &event_class, + event_construct, + 3, + event_props, + event_methods, + event_props, + event_methods ); return 1; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Aug 17 21:28:50 2006 @@ -1174,6 +1174,15 @@ return status; } +SWITCH_DECLARE(int32_t) switch_core_session_event_count(switch_core_session_t *session) +{ + if (session->event_queue) { + return (int32_t) switch_queue_size(session->event_queue); + } + + return -1; +} + SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_event(switch_core_session_t *session, switch_event_t **event) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu Aug 17 21:28:50 2006 @@ -393,6 +393,15 @@ return NULL; } +SWITCH_DECLARE(char *) switch_event_get_body(switch_event_t *event) +{ + if (event) { + return event->body; + } + + return NULL; +} + SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, char *header_name, char *fmt, ...) { @@ -623,7 +632,7 @@ switch_xml_t xbody = NULL; add_xml_header(xml, "Content-Length", blena, off++); - if ((xbody = switch_xml_add_child_d(xml, "body", 0))) { + if ((xbody = switch_xml_add_child_d(xml, "body", off++))) { switch_xml_set_txt_d(xbody, body); } } Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Aug 17 21:28:50 2006 @@ -1012,7 +1012,7 @@ char *txt = (xml->parent) ? xml->parent->txt : ""; switch_size_t off = 0; uint32_t lcount = 0; - + // parent character content up to this tag *s = switch_xml_ampencode(txt + start, xml->off - start, s, len, max, 0); @@ -1045,11 +1045,13 @@ switch_xml_ampencode(attr[i][j + 1], 0, s, len, max, 1); *len += sprintf(*s + *len, "\""); } - *len += sprintf(*s + *len, xml->child ? ">\n" : "/>\n"); + *len += sprintf(*s + *len, (xml->child || xml->txt) ? ">" : "/>\n"); + if (xml->child) { (*count)++; *s = switch_xml_toxml_r(xml->child, s, len, max, 0, attr, count); + } else { *s = switch_xml_ampencode(xml->txt, 0, s, len, max, 0); //data } @@ -1058,10 +1060,10 @@ *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); - if (xml->child) { - for (lcount = 0; lcount < *count; lcount++) { - *len += sprintf(*s + *len, "%s", XML_INDENT); // indent - } + if (xml->child || xml->txt) { + //for (lcount = 0; lcount < *count; lcount++) { + //*len += sprintf(*s + *len, "%s", XML_INDENT); // indent + //} *len += sprintf(*s + (*len), "</%s>\n", xml->name); // close tag }

1 0

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

18 Aug '06

Author: mikej Date: Thu Aug 17 21:23:18 2006 New Revision: 2322 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Log: fix segfault when there is a malformed registration in the db. Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Thu Aug 17 21:23:18 2006 @@ -1000,11 +1000,13 @@ static int del_callback(void *pArg, int argc, char **argv, char **columnNames){ switch_event_t *s_event; - if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_EXPIRE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "key", "%s", argv[0]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "url", "%s", argv[1]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%d", argv[2]); - switch_event_fire(&s_event); + if (argc >=3 ) { + if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_EXPIRE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "key", "%s", argv[0]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "url", "%s", argv[1]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%d", argv[2]); + switch_event_fire(&s_event); + } } return 0; }

1 0

[commit] r2321 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 17 Aug '06

17 Aug '06

Author: mikej Date: Thu Aug 17 19:47:24 2006 New Revision: 2321 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj Log: fix mod_event_socket destination Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj Thu Aug 17 19:47:24 2006 @@ -63,7 +63,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_event_socket.dll" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true" @@ -142,7 +142,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_event_socket.dll" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" GenerateDebugInformation="true"

1 0