mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ICE bug and leak in test.

Browse source
This commit is contained in:
Simon Morlat 2017-11-29 11:16:36 +01:00
parent f820302f60
commit 4192811b7f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coreapi/callbacks.c
View file

@ -480,6 +480,7 @@ static void call_ringing(SalOp *h){
linphone_core_notify_display_status(lc,_("Remote ringing..."));
linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");
}else{
SalMediaDescription *rmd = sal_call_get_remote_media_description(call->op);
/*initialize the remote call params by invoking linphone_call_get_remote_params(). This is useful as the SDP may not be present in the 200Ok*/
linphone_call_get_remote_params(call);
/*accept early media */
@ -496,7 +497,7 @@ static void call_ringing(SalOp *h){
video_stream_send_vfu(call->videostream);
}
#endif
return;
return;
}
linphone_core_notify_show_interface(lc);
@ -504,6 +505,9 @@ static void call_ringing(SalOp *h){
linphone_call_set_state(call,LinphoneCallOutgoingEarlyMedia,"Early media");
linphone_core_stop_ringing(lc);
ms_message("Doing early media...");
if (call->ice_session != NULL && rmd) {
linphone_call_update_ice_from_remote_media_description(call, rmd, !sal_call_is_offerer(call->op));
}
linphone_call_update_streams(call, md, call->state);
if ((linphone_call_params_get_audio_direction(linphone_call_get_current_params(call)) == LinphoneMediaDirectionInactive) && call->audiostream) {
if (lc->ringstream != NULL) return; /* Already ringing! */

3
tester/call_multi_tester.c
View file

@ -1139,10 +1139,13 @@ void do_not_stop_ringing_when_declining_one_of_two_incoming_calls(void) {
pauline_called_by_marie=linphone_core_get_current_call(marie->lc);
linphone_call_decline(pauline_called_by_laure, LinphoneReasonDeclined);
BC_ASSERT_TRUE(wait_for(laure->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallEnd,1));
BC_ASSERT_TRUE(wait_for(laure->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallReleased,1));
BC_ASSERT_TRUE(linphone_ringtoneplayer_is_started(pauline->lc->ringtoneplayer));
linphone_call_terminate(pauline_called_by_marie);
BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallEnd,2));
BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphoneCallReleased,2));
linphone_core_manager_destroy(marie);
linphone_core_manager_destroy(pauline);