From 5bcfd768a4bfe1bd5945b7f18a4e11af7965506a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 18 Jun 2018 14:34:18 +0200 Subject: [PATCH] Do not check for ICE gathering timeout, an event is triggered from ms2 when it happens. --- src/conference/session/call-session.cpp | 2 +- src/conference/session/media-session.cpp | 7 ------- tester/call_single_tester.c | 4 +--- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conference/session/call-session.cpp b/src/conference/session/call-session.cpp index 9a4656353..ef6394905 100644 --- a/src/conference/session/call-session.cpp +++ b/src/conference/session/call-session.cpp @@ -1018,7 +1018,7 @@ bool CallSession::initiateOutgoing () { void CallSession::iterate (time_t currentRealTime, bool oneSecondElapsed) { L_D(); int elapsed = (int)(currentRealTime - d->log->start_date_time); - if ((d->state == CallSession::State::OutgoingInit) && (elapsed >= getCore()->getCCore()->sip_conf.delayed_timeout)) { + if ((d->state == CallSession::State::OutgoingInit) && (elapsed > getCore()->getCCore()->sip_conf.delayed_timeout)) { /* Start the call even if the OPTIONS reply did not arrive */ startInvite(nullptr, ""); } diff --git a/src/conference/session/media-session.cpp b/src/conference/session/media-session.cpp index 04c7107d5..26967b041 100644 --- a/src/conference/session/media-session.cpp +++ b/src/conference/session/media-session.cpp @@ -4151,14 +4151,7 @@ bool MediaSession::initiateOutgoing () { void MediaSession::iterate (time_t currentRealTime, bool oneSecondElapsed) { L_D(); - int elapsed = (int)(currentRealTime - d->log->start_date_time); d->executeBackgroundTasks(oneSecondElapsed); - if ((d->state == CallSession::State::OutgoingInit) && (elapsed >= getCore()->getCCore()->sip_conf.delayed_timeout)) { - if (d->iceAgent->hasSession()) { - lWarning() << "ICE candidates gathering from [" << linphone_nat_policy_get_stun_server(d->natPolicy) << "] has not finished yet, proceed with the call without ICE anyway"; - d->iceAgent->deleteSession(); - } - } CallSession::iterate(currentRealTime, oneSecondElapsed); } diff --git a/tester/call_single_tester.c b/tester/call_single_tester.c index 3a97089de..fedc3608f 100644 --- a/tester/call_single_tester.c +++ b/tester/call_single_tester.c @@ -5941,7 +5941,6 @@ static void call_with_ice_without_stun2(void){ linphone_core_manager_destroy(pauline); } -#if 0 static void call_with_ice_stun_not_responding(void){ LinphoneCoreManager * marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); @@ -5955,7 +5954,6 @@ static void call_with_ice_stun_not_responding(void){ linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); } -#endif static void call_with_zrtp_configured_calling_side(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); @@ -6568,7 +6566,7 @@ test_t call_tests[] = { TEST_ONE_TAG("Call with ICE with default candidate not stun", call_with_ice_with_default_candidate_not_stun, "ICE"), TEST_ONE_TAG("Call with ICE without stun server", call_with_ice_without_stun, "ICE"), TEST_ONE_TAG("Call with ICE without stun server one side", call_with_ice_without_stun2, "ICE"), - /*TEST_ONE_TAG("Call with ICE and stun server not responding", call_with_ice_stun_not_responding, "ICE"),*/ + TEST_ONE_TAG("Call with ICE and stun server not responding", call_with_ice_stun_not_responding, "ICE"), TEST_NO_TAG("Call with ZRTP configured calling side only", call_with_zrtp_configured_calling_side), TEST_NO_TAG("Call with ZRTP configured receiver side only", call_with_zrtp_configured_callee_side), TEST_NO_TAG("Call from plain RTP to ZRTP mandatory should be silent", call_from_plain_rtp_to_zrtp),