diff --git a/src/conference/session/call-session-p.h b/src/conference/session/call-session-p.h index d8dbed101..595b7197d 100644 --- a/src/conference/session/call-session-p.h +++ b/src/conference/session/call-session-p.h @@ -88,6 +88,9 @@ protected: void setBroken (); void setContactOp (); + virtual void reinviteToRecoverFromConnectionLoss (); + virtual void repairByInviteWithReplaces (); + // CoreListener void onNetworkReachable (bool sipNetworkReachable, bool mediaNetworkReachable) override; void onRegistrationStateChanged (LinphoneProxyConfig *cfg, LinphoneRegistrationState cstate, const std::string &message) override; @@ -98,8 +101,6 @@ private: LinphoneAddress * getFixedContact () const; - virtual void reinviteToRecoverFromConnectionLoss (); - void repairByInviteWithReplaces (); void repairIfBroken (); protected: diff --git a/src/conference/session/call-session.cpp b/src/conference/session/call-session.cpp index ef6394905..a7b03fe0f 100644 --- a/src/conference/session/call-session.cpp +++ b/src/conference/session/call-session.cpp @@ -786,6 +786,7 @@ void CallSessionPrivate::reinviteToRecoverFromConnectionLoss () { void CallSessionPrivate::repairByInviteWithReplaces () { L_Q(); + lInfo() << "CallSession [" << q << "] is going to have a new INVITE replacing the previous one in order to recover from lost connectivity"; string callId = op->getCallId(); const char *fromTag = op->getLocalTag(); const char *toTag = op->getRemoteTag(); diff --git a/src/conference/session/media-session-p.h b/src/conference/session/media-session-p.h index efdfe04fd..dab25689e 100644 --- a/src/conference/session/media-session-p.h +++ b/src/conference/session/media-session-p.h @@ -249,6 +249,7 @@ private: void refreshSockets (); void reinviteToRecoverFromConnectionLoss () override; + void repairByInviteWithReplaces () override; #ifdef VIDEO_ENABLED void videoStreamEventCb (const MSFilter *f, const unsigned int eventId, const void *args); diff --git a/src/conference/session/media-session.cpp b/src/conference/session/media-session.cpp index 26967b041..512fb4a40 100644 --- a/src/conference/session/media-session.cpp +++ b/src/conference/session/media-session.cpp @@ -3823,6 +3823,14 @@ void MediaSessionPrivate::reinviteToRecoverFromConnectionLoss () { q->update(getParams()); } +void MediaSessionPrivate::repairByInviteWithReplaces () { + if ((state == CallSession::State::IncomingEarlyMedia) || (state == CallSession::State::OutgoingEarlyMedia)) { + stopStreams(); + initializeStreams(); + } + CallSessionPrivate::repairByInviteWithReplaces(); +} + // ----------------------------------------------------------------------------- #ifdef VIDEO_ENABLED diff --git a/tester/call_single_tester.c b/tester/call_single_tester.c index fedc3608f..77edd5f2a 100644 --- a/tester/call_single_tester.c +++ b/tester/call_single_tester.c @@ -5280,6 +5280,83 @@ end: linphone_core_manager_destroy(pauline); } +static void recovered_call_on_network_switch_in_early_media_base (bool_t callerLosesNetwork) { + LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); + LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc"); + bctbx_list_t *lcs = NULL; + LinphoneCall *marie_call; + LinphoneCallLog *marie_call_log; + uint64_t connected_time = 0; + uint64_t ended_time = 0; + + lcs = bctbx_list_append(lcs, marie->lc); + lcs = bctbx_list_append(lcs, pauline->lc); + + /* Marie calls Pauline, and after the call has rung, transitions to an early-media session */ + marie_call = linphone_core_invite_address(marie->lc, pauline->identity); + marie_call_log = linphone_call_get_call_log(marie_call); + BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived, 1, 3000)); + BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging, 1, 1000)); + + if (linphone_core_inc_invite_pending(pauline->lc)) { + /* Send a 183 to initiate the early media */ + linphone_call_accept_early_media(linphone_core_get_current_call(pauline->lc)); + BC_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingEarlyMedia, 1, 2000) ); + BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingEarlyMedia, 1, 2000) ); + BC_ASSERT_TRUE(linphone_call_get_all_muted(marie_call)); + + liblinphone_tester_check_rtcp(marie, pauline); + + if (callerLosesNetwork) { + /* Disconnect Marie's network and then reconnect it */ + linphone_core_set_network_reachable(marie->lc, FALSE); + wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableFalse, 1); + linphone_core_set_network_reachable(marie->lc, TRUE); + wait_for(marie->lc, pauline->lc, &marie->stat.number_of_NetworkReachableTrue, 2); + BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneRegistrationOk, 2)); + } else { + /* Disconnect Pauline's network and then reconnect it */ + linphone_core_set_network_reachable(pauline->lc, FALSE); + wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableFalse, 1); + linphone_core_set_network_reachable(pauline->lc, TRUE); + wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_NetworkReachableTrue, 2); + BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneRegistrationOk, 2)); + } + + wait_for_until(marie->lc, pauline->lc, NULL, 1, 2000); + + if (linphone_core_get_current_call(pauline->lc) + && (linphone_call_get_state(linphone_core_get_current_call(pauline->lc)) == LinphoneCallIncomingEarlyMedia) + ) { + linphone_call_accept(linphone_core_get_current_call(pauline->lc)); + BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallConnected, 1, 1000)); + connected_time = ms_get_cur_time_ms(); + BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, 1, 1000)); + BC_ASSERT_PTR_EQUAL(marie_call, linphone_core_get_current_call(marie->lc)); + BC_ASSERT_FALSE(linphone_call_get_all_muted(marie_call)); + + liblinphone_tester_check_rtcp(marie, pauline); + wait_for_list(lcs, 0, 1, 2000); /* Just to have a call duration != 0 */ + + end_call(pauline, marie); + ended_time = ms_get_cur_time_ms(); + BC_ASSERT_LOWER(labs((long)((linphone_call_log_get_duration(marie_call_log) * 1000) - (int64_t)(ended_time - connected_time))), 1500, long, "%ld"); + } + } + + bctbx_list_free(lcs); + linphone_core_manager_destroy(marie); + linphone_core_manager_destroy(pauline); +} + +static void recovered_call_on_network_switch_in_early_media_1 (void) { + recovered_call_on_network_switch_in_early_media_base(TRUE); +} + +static void recovered_call_on_network_switch_in_early_media_2 (void) { + recovered_call_on_network_switch_in_early_media_base(FALSE); +} + static void _call_with_network_switch(bool_t use_ice, bool_t with_socket_refresh, bool_t enable_rtt, bool_t caller_pause, bool_t callee_pause) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); @@ -6553,6 +6630,8 @@ test_t call_tests[] = { TEST_ONE_TAG("Recovered call on network switch during re-invite 2", recovered_call_on_network_switch_during_reinvite_2, "CallRecovery"), TEST_ONE_TAG("Recovered call on network switch during re-invite 3", recovered_call_on_network_switch_during_reinvite_3, "CallRecovery"), TEST_ONE_TAG("Recovered call on network switch during re-invite 4", recovered_call_on_network_switch_during_reinvite_4, "CallRecovery"), + TEST_ONE_TAG("Recovered call on network switch in early media 1", recovered_call_on_network_switch_in_early_media_1, "CallRecovery"), + TEST_ONE_TAG("Recovered call on network switch in early media 2", recovered_call_on_network_switch_in_early_media_2, "CallRecovery"), TEST_ONE_TAG("Call with network switch in paused state", call_with_network_switch_in_paused_state, "CallRecovery"), TEST_ONE_TAG("Call with network switch in paused by remote state", call_with_network_switch_in_paused_by_remote_state, "CallRecovery"), TEST_ONE_TAG("Call with network switch and ICE", call_with_network_switch_and_ice, "ICE"),