mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 02:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'linphone/master' into daemon

Browse source
This commit is contained in:
Simon Morlat 2015-03-19 14:46:13 +01:00
commit 7a1dd198a1
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -91,10 +91,6 @@ rpm-novideo: rpm-base
#a zip containing win32 binaries, suitable to generate an installer
if BUILD_ZRTP
WINBINDIST_FILES+=./bin/libzrtpcpp.dll ./bin/msys-1.0.dll ./bin/msys-crypto-1.0.0.dll
endif
if BUILD_TUNNEL
WINBINDIST_FILES+=./bin/libtunnel-0.dll
endif

4
coreapi/authentication.c
View file

@ -353,7 +353,7 @@ void linphone_core_add_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *info)
info->domain ? info->domain : "");
}
ms_list_free(l);
write_auth_infos(lc);
if(lc->sip_conf.save_auth_info) write_auth_infos(lc);
}
@ -373,7 +373,7 @@ void linphone_core_remove_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *in
if (r){
lc->auth_info=ms_list_remove(lc->auth_info,r);
linphone_auth_info_destroy(r);
write_auth_infos(lc);
if(lc->sip_conf.save_auth_info) write_auth_infos(lc);
}
}

3
coreapi/callbacks.c
View file

@ -432,7 +432,8 @@ static void call_ringing(SalOp *h){
linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing");
}else{
/*accept early media */
if (call->audiostream && audio_stream_started(call->audiostream)){
if ((call->audiostream && audio_stream_started(call->audiostream))
|| (call->videostream && video_stream_started(call->videostream))) {
/*streams already started */
try_early_media_forking(call,md);
#ifdef VIDEO_ENABLED

1
coreapi/linphonecore.c
View file

@ -961,6 +961,7 @@ static void sip_config_read(LinphoneCore *lc)
lc->sip_conf.vfu_with_info=lp_config_get_int(lc->config,"sip","vfu_with_info",1);
linphone_core_set_sip_transport_timeout(lc, lp_config_get_int(lc->config, "sip", "transport_timeout", 63000));
sal_set_supported_tags(lc->sal,lp_config_get_string(lc->config,"sip","supported","replaces, outbound"));
lc->sip_conf.save_auth_info = lp_config_get_int(lc->config, "sip", "save_auth_info", 1);
}
static void rtp_config_read(LinphoneCore *lc)

1
coreapi/private.h
View file

@ -583,6 +583,7 @@ typedef struct sip_config
bool_t auto_net_state_mon;
bool_t tcp_tls_keepalive;
bool_t vfu_with_info; /*use to enable vfu request using sip info*/
bool_t save_auth_info; // if true, auth infos will be write in the config file when they are added to the list
} sip_config_t;
typedef struct rtp_config

3
tester/video_tester.c
View file

@ -450,6 +450,9 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void
CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth == 0);
CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth == 0);
CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth == 0);
CU_ASSERT_TRUE(linphone_call_get_video_stats(pauline_call)->download_bandwidth == 0);
CU_ASSERT_TRUE(linphone_call_get_video_stats(marie1_call)->download_bandwidth > 0);
CU_ASSERT_TRUE(linphone_call_get_video_stats(marie2_call)->download_bandwidth > 0);
linphone_call_params_set_audio_direction(marie1_params, LinphoneMediaDirectionSendRecv);
linphone_core_accept_call_with_params(marie1->lc, linphone_core_get_current_call(marie1->lc), marie1_params);