August 2006 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r2423 - freeswitch/branches/marocon
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: sphere Date: Tue Aug 29 08:45:37 2006 New Revision: 2423 Added: freeswitch/branches/marocon/ Log: Creating empty folder for marocon

1 0

[Freeswitch-svn] [commit] r2422 - in freeswitch/trunk: build src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Mon Aug 28 22:42:27 2006 New Revision: 2422 Modified: freeswitch/trunk/build/checkversion.sh freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: WIP Modified: freeswitch/trunk/build/checkversion.sh ============================================================================== --- freeswitch/trunk/build/checkversion.sh (original) +++ freeswitch/trunk/build/checkversion.sh Mon Aug 28 22:42:27 2006 @@ -1,5 +1,9 @@ #!/bin/sh +if [ -f .noversion ] ; then + exit +fi + if eval test x${1} = xforce ; then rm -f .version fi Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 22:42:27 2006 @@ -724,7 +724,9 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); if (tech_pvt->nh) { - nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + nua_respond(tech_pvt->nh, SIP_200_OK, + //SIPTAG_CONTACT(tech_pvt->contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); } } @@ -1001,7 +1003,9 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "183 SDP:\n%s\n", tech_pvt->local_sdp_str); - nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, + //SIPTAG_CONTACT(tech_pvt->contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } } @@ -1241,7 +1245,9 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, + //SIPTAG_CONTACT(tech_pvt->contact), + TAG_END()); break; case nua_callstate_completing: nua_ack(nh, TAG_END()); @@ -1270,12 +1276,13 @@ switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); - //nua_respond(nh, SIP_100_TRYING, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); return; } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, + //SIPTAG_CONTACT(tech_pvt->contact), + TAG_END()); break; case nua_callstate_early: break; @@ -1314,7 +1321,9 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, + //SIPTAG_CONTACT(tech_pvt->contact), + TAG_END()); break; case nua_callstate_terminating: break; @@ -1366,6 +1375,8 @@ snprintf(username, sizeof(username), "%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); attach_private(session, profile, tech_pvt, username); + + snprintf(username, sizeof(username), "sip:%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE(username), NULL); channel = switch_core_session_get_channel(session);

1 0

[Freeswitch-svn] [commit] r2421 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Mon Aug 28 21:27:23 2006 New Revision: 2421 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 21:27:23 2006 @@ -110,6 +110,7 @@ char *extsipip; char *username; char *url; + char *sipdomain; int sip_port; char *codec_string; char *codec_order[SWITCH_MAX_CODECS]; @@ -1250,11 +1251,9 @@ sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; - - tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); - + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { match = negotiate_sdp(session, sdp); @@ -1367,6 +1366,7 @@ snprintf(username, sizeof(username), "%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); attach_private(session, profile, tech_pvt, username); + tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE(username), NULL); channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); @@ -1538,10 +1538,11 @@ TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(profile->nua, - NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), - NUTAG_AUTOALERT(0)); + NUTAG_AUTOALERT(0), + SIPTAG_SUPPORTED_STR("100rel, precondition") + ); for (node = profile->aliases; node; node = node->next) { @@ -1549,16 +1550,12 @@ event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(node->url), - NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), - NUTAG_AUTOANSWER(0), - NUTAG_AUTOALERT(0), TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua, NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), NUTAG_AUTOANSWER(0), + SIPTAG_SUPPORTED_STR("100rel, precondition"), NUTAG_AUTOALERT(0)); } @@ -1655,6 +1652,8 @@ profile->rtpip = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "sip-ip")) { profile->sipip = switch_core_strdup(profile->pool, val); + } else if (!strcmp(var, "sip-domain")) { + profile->sipdomain = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "ext-sip-ip")) { profile->extsipip = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "username")) { @@ -1709,6 +1708,9 @@ profile->dialplan = switch_core_strdup(profile->pool, "default"); } + if (!profile->sipdomain) { + profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); + } snprintf(url, sizeof(url), "sip:%s:%d", profile->sipip, profile->sip_port); profile->url = switch_core_strdup(profile->pool, url);

1 0

[Freeswitch-svn] [commit] r2420 - in freeswitch/trunk/src: . include
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Mon Aug 28 21:13:38 2006 New Revision: 2420 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_ivr.c Log: tweaks Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Aug 28 21:13:38 2006 @@ -89,6 +89,8 @@ struct switch_core_thread_session { /*! status of the thread */ int running; + /*! mutex */ + switch_mutex_t *mutex; /*! array of void pointers to pass mutiple data objects */ void *objs[SWITCH_MAX_CORE_THREAD_SESSION_OBJS]; /*! a pointer to a memory pool if the thread has it's own pool */ Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 28 21:13:38 2006 @@ -979,7 +979,7 @@ switch_channel_set_flag(chan_a, CF_BRIDGED); - while (data->running > 0 && his_thread->running > 0) { + while (switch_channel_ready(chan_a) && data->running > 0 && his_thread->running > 0) { switch_channel_state_t b_state = switch_channel_get_state(chan_b); switch_status_t status; switch_event_t *event; @@ -987,7 +987,9 @@ switch (b_state) { case CS_HANGUP: case CS_DONE: + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); continue; default: break; @@ -1024,7 +1026,9 @@ if (input_callback) { if (input_callback(session_a, dtmf, SWITCH_INPUT_TYPE_DTMF, user_data, 0) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s ended call via DTMF\n", switch_channel_get_name(chan_a)); + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); break; } } @@ -1049,13 +1053,18 @@ if (SWITCH_READ_ACCEPTABLE(status)) { if (status != SWITCH_STATUS_BREAK) { if (switch_core_session_write_frame(session_b, read_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write: %s Bad Frame....[%u] Bubye!\n", switch_channel_get_name(chan_b), read_frame->datalen); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write: %s Bad Frame....[%u] Bubye!\n", + switch_channel_get_name(chan_b), read_frame->datalen); + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); } } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "read: %s Bad Frame.... Bubye!\n", switch_channel_get_name(chan_a)); + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); } //switch_yield(1000); @@ -1066,11 +1075,12 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - data->running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); switch_channel_clear_flag(chan_a, CF_BRIDGED); + switch_mutex_lock(data->mutex); data->running = 0; + switch_mutex_unlock(data->mutex); return NULL; } @@ -1625,6 +1635,7 @@ other_audio_thread->objs[4] = session_data; other_audio_thread->objs[5] = this_audio_thread; other_audio_thread->running = 5; + switch_mutex_init(&other_audio_thread->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); this_audio_thread->objs[0] = peer_session; this_audio_thread->objs[1] = session; @@ -1633,6 +1644,7 @@ this_audio_thread->objs[4] = peer_session_data; this_audio_thread->objs[5] = other_audio_thread; this_audio_thread->running = 2; + switch_mutex_init(&this_audio_thread->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(peer_session)); switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); @@ -1675,17 +1687,25 @@ this_audio_thread->objs[3] = NULL; this_audio_thread->objs[4] = NULL; this_audio_thread->objs[5] = NULL; - this_audio_thread->running = 2; + switch_mutex_lock(this_audio_thread->mutex); + this_audio_thread->running = 0; + switch_mutex_unlock(this_audio_thread->mutex); - if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) < CS_HANGUP) { switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL); switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); } switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); - other_audio_thread->running = 0; - + + if (other_audio_thread->running > 0) { + switch_mutex_lock(other_audio_thread->mutex); + other_audio_thread->running = -1; + switch_mutex_unlock(other_audio_thread->mutex); + while (other_audio_thread->running) { + switch_yield(1000); + } + } switch_core_session_rwunlock(peer_session); } else {

1 0

[Freeswitch-svn] [commit] r2419 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 19:50:10 2006 New Revision: 2419 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_rtp.c Log: fix stupidness Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 19:50:10 2006 @@ -723,7 +723,6 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); if (tech_pvt->nh) { - tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); } @@ -995,10 +994,12 @@ if (!switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); + /* Transmit 183 Progress with SDP */ tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); activate_rtp(tech_pvt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "183 SDP:\n%s\n", tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } @@ -1251,6 +1252,9 @@ uint8_t match = 0; + tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); + + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { match = negotiate_sdp(session, sdp); @@ -1267,7 +1271,7 @@ switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); - //nua_respond(nh, SIP_180_RINGING, TAG_END()); + //nua_respond(nh, SIP_100_TRYING, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); return; } } @@ -1531,10 +1535,15 @@ event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->url), - NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), TAG_END()); /* Last tag should always finish the sequence */ + nua_set_params(profile->nua, + NUTAG_EARLY_MEDIA(1), + SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0)); + + for (node = profile->aliases; node; node = node->next) { node->nua = nua_create(profile->s_root, /* Event loop */ event_callback, /* Callback for processing events */ @@ -1542,8 +1551,16 @@ NUTAG_URL(node->url), NUTAG_EARLY_MEDIA(1), SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0), TAG_END()); /* Last tag should always finish the sequence */ + nua_set_params(node->nua, + NUTAG_EARLY_MEDIA(1), + SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0)); + } su_root_run(profile->s_root); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 28 19:50:10 2006 @@ -1678,7 +1678,7 @@ this_audio_thread->running = 2; - if (!switch_channel_test_flag(peer_channel, CF_TRANSFER)) { + if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) < CS_HANGUP) { switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL); switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Aug 28 19:50:10 2006 @@ -547,7 +547,7 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) { - return switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) ? 1 : 0; + return (rtp_session != NULL && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) ? 1 : 0; } SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)

1 0

[Freeswitch-svn] [commit] r2418 - freeswitch/trunk/src
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 19:44:38 2006 New Revision: 2418 Modified: freeswitch/trunk/src/switch_ivr.c Log: tweaks Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 28 19:44:38 2006 @@ -1069,15 +1069,6 @@ data->running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); - if (switch_channel_test_flag(chan_a, CF_ORIGINATOR)) { - if (!switch_channel_test_flag(chan_b, CF_TRANSFER)) { - switch_core_session_kill_channel(session_b, SWITCH_SIG_KILL); - switch_channel_hangup(chan_b, SWITCH_CAUSE_NORMAL_CLEARING); - } - switch_channel_clear_flag(chan_a, CF_ORIGINATOR); - his_thread->running = 0; - } - switch_channel_clear_flag(chan_a, CF_BRIDGED); data->running = 0; return NULL; @@ -1645,7 +1636,7 @@ switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); - if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_ANSWERED)) { switch_channel_answer(caller_channel); } @@ -1685,7 +1676,18 @@ this_audio_thread->objs[4] = NULL; this_audio_thread->objs[5] = NULL; this_audio_thread->running = 2; + + + if (!switch_channel_test_flag(peer_channel, CF_TRANSFER)) { + switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL); + switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); + } + + switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); + other_audio_thread->running = 0; + switch_core_session_rwunlock(peer_session); + } else { status = SWITCH_STATUS_FALSE; }

1 0

[Freeswitch-svn] [commit] r2417 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_exosip mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 19:05:26 2006 New Revision: 2417 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_rtp.c Log: tweaks Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Mon Aug 28 19:05:26 2006 @@ -140,6 +140,13 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session); /*! + \brief Test if an RTP session is ready + \param rtp_session an RTP session to test + \return a true value if it's ready +*/ +SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session); + +/*! \brief Destroy an RTP session \param rtp_session an RTP session to destroy */ 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 Mon Aug 28 19:05:26 2006 @@ -286,7 +286,7 @@ int ms = 20; switch_rtp_flag_t flags; - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { return 1; } @@ -695,7 +695,7 @@ ldl_session_destroy(&tech_pvt->dlsession); } - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_destroy(&tech_pvt->rtp_session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NUKE RTP\n"); tech_pvt->rtp_session = NULL; @@ -734,7 +734,7 @@ } - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_kill_socket(tech_pvt->rtp_session); } @@ -1629,7 +1629,7 @@ if (*msg == '+') { switch_channel_queue_dtmf(channel, msg + 1); switch_set_flag_locked(tech_pvt, TFLAG_DTMF); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); } } 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 Mon Aug 28 19:05:26 2006 @@ -490,7 +490,7 @@ { int loops = 0;//, sock = -1; - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) { switch_yield(10000); loops++; @@ -587,7 +587,7 @@ key, &err, switch_core_session_get_pool(tech_pvt->session)); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { 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; uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; @@ -840,7 +840,7 @@ switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_set_flag_locked(tech_pvt, TFLAG_BYE); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_kill_socket(tech_pvt->rtp_session); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 19:05:26 2006 @@ -579,7 +579,7 @@ { int loops = 0;//, sock = -1; - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) { switch_yield(10000); loops++; @@ -606,7 +606,7 @@ assert(tech_pvt->codecs[tech_pvt->codec_index] != NULL); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { return SWITCH_STATUS_SUCCESS; } @@ -680,7 +680,7 @@ &err, switch_core_session_get_pool(tech_pvt->session)); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { 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; uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; @@ -906,7 +906,7 @@ switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_set_flag_locked(tech_pvt, TFLAG_HUP); - if (tech_pvt->rtp_session) { + if (switch_rtp_ready(tech_pvt->rtp_session)) { switch_rtp_kill_socket(tech_pvt->rtp_session); } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Aug 28 19:05:26 2006 @@ -1242,7 +1242,8 @@ *frame = NULL; while (switch_channel_test_flag(session->channel, CF_HOLD)) { - return SWITCH_STATUS_BREAK; + status = SWITCH_STATUS_BREAK; + goto done; } if (session->endpoint_interface->io_routines->read_frame) { @@ -1261,15 +1262,20 @@ } } - if (status != SWITCH_STATUS_SUCCESS || !(*frame)) { - return status; + if (status != SWITCH_STATUS_SUCCESS) { + goto done; } + if (!(*frame)) { + goto done; + } + assert(session != NULL); assert(*frame != NULL); if (switch_test_flag(*frame, SFF_CNG)) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; + goto done; } if ((session->read_codec && (*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { @@ -1318,7 +1324,7 @@ default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", session->read_codec->codec_interface->interface_name); - return status; + goto done; } } if (session->read_resampler) { @@ -1346,7 +1352,8 @@ switch_buffer_create(session->pool, &session->raw_read_buffer, bytes); } if (!switch_buffer_write(session->raw_read_buffer, read_frame->data, read_frame->datalen)) { - return SWITCH_STATUS_MEMERR; + status = SWITCH_STATUS_MEMERR; + goto done; } } @@ -1401,6 +1408,11 @@ goto top; } } + } + + done: + if (!(*frame)) { + status = SWITCH_STATUS_FALSE; } return status; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Aug 28 19:05:26 2006 @@ -170,6 +170,7 @@ struct switch_rtp_rfc2833_data dtmf_data; uint8_t mini; switch_payload_t te; + switch_mutex_t *flag_mutex; }; static int global_init = 0; @@ -332,9 +333,9 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock, APR_SO_NONBLOCK, TRUE); - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); } - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_IO); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); return SWITCH_STATUS_SUCCESS; } @@ -378,9 +379,13 @@ return SWITCH_STATUS_MEMERR; } + + rtp_session->pool = pool; rtp_session->flags = flags; rtp_session->te = 101; + + switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_mutex_init(&rtp_session->dtmf_data.dtmf_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_buffer_create(rtp_session->pool, &rtp_session->dtmf_data.dtmf_buffer, 128); /* for from address on recvfrom calls */ @@ -390,7 +395,7 @@ if (crypto_key) { int len; - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_SECURE); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_SECURE); crypto_policy_set_rtp_default(&policy.rtp); crypto_policy_set_rtcp_default(&policy.rtcp); policy.ssrc.type = ssrc_any_inbound; @@ -502,7 +507,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { switch_rtp_miniframe_probe(rtp_session); - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_MINI); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_MINI); } return rtp_session; @@ -537,24 +542,33 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { apr_socket_shutdown(rtp_session->sock, APR_SHUTDOWN_READWRITE); - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); } +SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) +{ + return switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) ? 1 : 0; +} SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session) { + + if (!switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_IO)) { + return; + } + switch_rtp_kill_socket(*rtp_session); switch_socket_close((*rtp_session)->sock); if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) { switch_rtp_disable_vad(*rtp_session); } + if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_SECURE)) { srtp_dealloc((*rtp_session)->recv_ctx); srtp_dealloc((*rtp_session)->send_ctx); } - *rtp_session = NULL; return; } @@ -591,7 +605,7 @@ SWITCH_DECLARE(void) switch_rtp_set_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_set_flag(rtp_session, flags); + switch_set_flag_locked(rtp_session, flags); } @@ -605,7 +619,7 @@ SWITCH_DECLARE(void) switch_rtp_clear_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_clear_flag(rtp_session, flags); + switch_clear_flag_locked(rtp_session, flags); } @@ -698,7 +712,7 @@ status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *)&rtp_session->recv_msg, &bytes); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); return 0; } @@ -727,7 +741,7 @@ uint32_t effective_size = (uint32_t)(bytes - sizeof(srtp_mini_hdr_t)); if (rtp_session->recv_msg.header.pt == RTP_MAGIC_NUMBER) { if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_MINI); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_MINI); rtp_session->rpacket_size = ntohl(rtp_session->recv_msg.header.ts); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "YAY MINI-RTP! %d\n", rtp_session->rpacket_size); switch_rtp_miniframe_probe(rtp_session); @@ -802,7 +816,7 @@ switch_rtp_set_remote_address(rtp_session, tx_host, rtp_session->from_addr->port, &err); } } - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } } @@ -1231,7 +1245,7 @@ return SWITCH_STATUS_GENERR; } switch_core_codec_destroy(&rtp_session->vad_data.vad_codec); - switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_VAD); + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_VAD); return SWITCH_STATUS_SUCCESS; } @@ -1268,7 +1282,7 @@ rtp_session->vad_data.start = 0; rtp_session->vad_data.next_scan = time(NULL); rtp_session->vad_data.scan_freq = 0; - switch_set_flag(rtp_session, SWITCH_RTP_FLAG_VAD); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_VAD); switch_set_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_CNG); return SWITCH_STATUS_SUCCESS; }

1 0

[Freeswitch-svn] [commit] r2416 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 12:40:05 2006 New Revision: 2416 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: WIP Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 12:40:05 2006 @@ -52,6 +52,7 @@ #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> #include <sofia-sip/sdp.h> +#include <sofia-sip/sip_protos.h> #define DBFILE "sofia" static const char modname[] = "mod_sofia"; @@ -167,6 +168,8 @@ switch_mutex_t *flag_mutex; switch_payload_t te; nua_handle_t *nh; + su_home_t *home; + sip_contact_t *contact; }; /* Function Prototypes */ @@ -351,6 +354,10 @@ tech_pvt->profile = profile; tech_pvt->te = profile->te; tech_pvt->session = session; + + tech_pvt->home = su_home_new(sizeof(*tech_pvt->home)); + su_home_init(tech_pvt->home); + switch_core_session_set_private(session, tech_pvt); tech_set_codecs(tech_pvt); @@ -535,6 +542,10 @@ deactivate_rtp(tech_pvt); + su_home_deinit(tech_pvt->home); + + + if (tech_pvt->nh) { if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { nua_bye(tech_pvt->nh, TAG_END()); @@ -712,7 +723,8 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); if (tech_pvt->nh) { - nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); + nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); } } @@ -987,7 +999,7 @@ tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); activate_rtp(tech_pvt); - nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } } @@ -1203,8 +1215,7 @@ break; case nua_callstate_proceeding: if (session && r_sdp) { - su_home_t home[1] = { SU_HOME_INIT(home) }; - sdp_parser_t *parser = sdp_parse(home, r_sdp, (int)strlen(r_sdp), 0); + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; @@ -1218,9 +1229,6 @@ sdp_parser_free(parser); } - if (home) { - su_home_deinit(home); - } if (match) { tech_choose_port(tech_pvt); @@ -1231,17 +1239,17 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); break; case nua_callstate_completing: nua_ack(nh, TAG_END()); break; case nua_callstate_received: if (session && r_sdp) { - su_home_t home[1] = { SU_HOME_INIT(home) }; - sdp_parser_t *parser = sdp_parse(home, r_sdp, (int)strlen(r_sdp), 0); + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { @@ -1253,12 +1261,9 @@ sdp_parser_free(parser); } - if (home) { - su_home_deinit(home); - } if (match) { - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); + switch_channel_set_variable(channel, "endpoint_disposition", "RECEIVED"); switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); @@ -1267,7 +1272,7 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); break; case nua_callstate_early: break; @@ -1276,8 +1281,7 @@ case nua_callstate_ready: if (session) { if (r_sdp) { - su_home_t home[1] = { SU_HOME_INIT(home) }; - sdp_parser_t *parser = sdp_parse(home, r_sdp, (int)strlen(r_sdp), 0); + sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; @@ -1291,11 +1295,9 @@ sdp_parser_free(parser); } - if (home) { - su_home_deinit(home); - } if (match) { + switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); tech_choose_port(tech_pvt); activate_rtp(tech_pvt); @@ -1309,7 +1311,7 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); break; case nua_callstate_terminating: break;

1 0

[Freeswitch-svn] [commit] r2415 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: brian Date: Sun Aug 27 23:14:21 2006 New Revision: 2415 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: adding note Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Aug 27 23:14:21 2006 @@ -1736,6 +1736,10 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { + /* Adding Note so we can destroy these properly. Will remind tony. + * nua_destroy (nua); + * su_root_destroy (root); + */ su_deinit(); return SWITCH_STATUS_SUCCESS;

1 0

[Freeswitch-svn] [commit] r2414 - freeswitch/trunk/libs/win32
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: mikej Date: Sun Aug 27 22:01:41 2006 New Revision: 2414 Modified: freeswitch/trunk/libs/win32/util.vbs Log: use different bat file names so multi proc systems can download more than one lib at a time without failing. Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Sun Aug 27 22:01:41 2006 @@ -25,7 +25,7 @@ Else UseWgetEXE=false End If - +Randomize Set objArgs = WScript.Arguments quote=Chr(34) ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName)) @@ -91,19 +91,20 @@ End Sub Sub UnCompress(Archive, DestFolder) + batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" wscript.echo("Extracting: " & Archive) - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Archive & quote & " -y -o" & quote & DestFolder & quote ) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream If FSO.FileExists(Left(Archive, Len(Archive)-3))Then - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & quote & " -y -o" & quote & DestFolder & quote ) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream @@ -111,10 +112,10 @@ FSO.DeleteFile Left(Archive, Len(Archive)-3) ,true End If If FSO.FileExists(Left(Archive, Len(Archive)-3) & "tar")Then - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@" & quote & UtilsDir & "7za.exe" & quote & " x " & quote & Left(Archive, Len(Archive)-3) & "tar" & quote & " -y -o" & quote & DestFolder & quote ) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream @@ -123,6 +124,9 @@ End If WScript.Sleep(500) + If FSO.FileExists(UtilsDir & batname)Then + FSO.DeleteFile UtilsDir & batname, True + End If End Sub Sub Wget(URL, DestFolder) @@ -134,11 +138,12 @@ Wscript.echo("Downloading: " & URL) If UseWgetEXE Then - Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + batname = "tmp" & CStr(Int(10000*Rnd)) & ".bat" + Set MyFile = fso.CreateTextFile(UtilsDir & batname, True) MyFile.WriteLine("@cd " & quote & DestFolder & quote) MyFile.WriteLine("@" & quote & UtilsDir & "wget.exe" & quote & " " & URL) MyFile.Close - Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Set oExec = WshShell.Exec(UtilsDir & batname) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream

1 0