diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 95f1e8646..b27270972 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -7007,7 +7007,12 @@ LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const cha /** - * Check if a call will need the sound resources. + * Check if a call will need the sound resources in near future (typically an outgoing call that is awaiting + * response). + * In liblinphone, it is not possible to have two independant calls using sound device or camera at the same time. + * In order to prevent this situation, an application can use linphone_core_sound_resources_locked() to know whether + * it is possible at a given time to start a new outgoing call. + * When the function returns TRUE, an application should not allow the user to start an outgoing call. * * @ingroup call_control * @param lc The LinphoneCore diff --git a/tester/complex_sip_call_tester.c b/tester/complex_sip_call_tester.c index 3f8906de0..b446592a7 100644 --- a/tester/complex_sip_call_tester.c +++ b/tester/complex_sip_call_tester.c @@ -90,7 +90,8 @@ static FILE *sip_start_recv(const char *senario) { static void dest_server_server_resolved(void *data, const char *name, struct addrinfo *ai_list) { *(struct addrinfo **)data =ai_list; - } +} + LinphoneAddress * linphone_core_manager_resolve(LinphoneCoreManager *mgr, const LinphoneAddress *source) { struct addrinfo *addrinfo = NULL; char ipstring [INET6_ADDRSTRLEN]; @@ -109,6 +110,9 @@ LinphoneAddress * linphone_core_manager_resolve(LinphoneCoreManager *mgr, const wait_for(mgr->lc, mgr->lc, (int*)&addrinfo, 1); err=getnameinfo((struct sockaddr*)addrinfo->ai_addr,addrinfo->ai_addrlen,ipstring,INET6_ADDRSTRLEN,NULL,0,NI_NUMERICHOST); + if (err !=0 ){ + ms_error("linphone_core_manager_resolve(): getnameinfo error %s", gai_strerror(err)); + } linphone_address_set_domain(dest, ipstring); if (port > 0) linphone_address_set_port(dest, port); diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c index 503b586b3..1cd8d2071 100644 --- a/tester/flexisip_tester.c +++ b/tester/flexisip_tester.c @@ -925,12 +925,12 @@ static void test_subscribe_notify_with_sipp_publisher(void) { LinphoneAddress *sip_example_org; const LinphoneAuthInfo *marie_auth = linphone_core_find_auth_info(marie->lc, NULL, linphone_address_get_username(marie->identity), NULL); LpConfig *pauline_lp = linphone_core_get_config(pauline->lc); + char* lf_identity=linphone_address_as_string_uri_only(marie->identity); + LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL); linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL); - - char* lf_identity=linphone_address_as_string_uri_only(marie->identity); - LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); + ms_free(lf_identity); lp_config_set_int(pauline_lp,"sip","subscribe_expires",5); diff --git a/tester/rcfiles/laure_call_logs_rc b/tester/rcfiles/laure_call_logs_rc index 268707287..bbeafabeb 100644 --- a/tester/rcfiles/laure_call_logs_rc +++ b/tester/rcfiles/laure_call_logs_rc @@ -4,7 +4,7 @@ sip_tcp_port=5092 sip_tls_port=5093 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + [auth_info_0] username=laure diff --git a/tester/rcfiles/laure_rc b/tester/rcfiles/laure_rc index 283f917f7..c4016c4fa 100644 --- a/tester/rcfiles/laure_rc +++ b/tester/rcfiles/laure_rc @@ -4,7 +4,7 @@ sip_tcp_port=5092 sip_tls_port=5093 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + [auth_info_0] username=laure diff --git a/tester/rcfiles/laure_tcp_rc b/tester/rcfiles/laure_tcp_rc index fa8364993..e39a83e49 100644 --- a/tester/rcfiles/laure_tcp_rc +++ b/tester/rcfiles/laure_tcp_rc @@ -4,7 +4,7 @@ sip_tcp_port=5092 sip_tls_port=5093 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + [auth_info_0] username=laure diff --git a/tester/rcfiles/marie_early_rc b/tester/rcfiles/marie_early_rc index efa5408bb..65936de01 100644 --- a/tester/rcfiles/marie_early_rc +++ b/tester/rcfiles/marie_early_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + incoming_calls_early_media=1 [auth_info_0] diff --git a/tester/rcfiles/marie_h264_rc b/tester/rcfiles/marie_h264_rc index 8cd970d24..d13359a02 100644 --- a/tester/rcfiles/marie_h264_rc +++ b/tester/rcfiles/marie_h264_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/marie_quality_reporting_rc b/tester/rcfiles/marie_quality_reporting_rc index 10cacfc7d..94c64c5d3 100644 --- a/tester/rcfiles/marie_quality_reporting_rc +++ b/tester/rcfiles/marie_quality_reporting_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/marie_rc b/tester/rcfiles/marie_rc index f1f65441b..2713c20eb 100644 --- a/tester/rcfiles/marie_rc +++ b/tester/rcfiles/marie_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 store_ha1_passwd=0 #used for sipp diff --git a/tester/rcfiles/marie_rc_rtcp_xr b/tester/rcfiles/marie_rc_rtcp_xr index 4f2ead6df..d9197123b 100644 --- a/tester/rcfiles/marie_rc_rtcp_xr +++ b/tester/rcfiles/marie_rc_rtcp_xr @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/marie_sips_rc b/tester/rcfiles/marie_sips_rc index 3556248b0..2a62bbb03 100644 --- a/tester/rcfiles/marie_sips_rc +++ b/tester/rcfiles/marie_sips_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/marie_zrtp_aes256_rc b/tester/rcfiles/marie_zrtp_aes256_rc index 2230535b6..c63c59121 100644 --- a/tester/rcfiles/marie_zrtp_aes256_rc +++ b/tester/rcfiles/marie_zrtp_aes256_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 zrtp_cipher_suites=MS_ZRTP_CIPHER_AES3,MS_ZRTP_CIPHER_AES1 diff --git a/tester/rcfiles/marie_zrtp_b256_rc b/tester/rcfiles/marie_zrtp_b256_rc index a9668f2f9..0b6f1c42c 100644 --- a/tester/rcfiles/marie_zrtp_b256_rc +++ b/tester/rcfiles/marie_zrtp_b256_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 zrtp_sas_suites=MS_ZRTP_SAS_B256 diff --git a/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc b/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc index 3dc5b4d6a..a6a0a5eaf 100644 --- a/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc +++ b/tester/rcfiles/marie_zrtp_srtpsuite_aes256_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32 diff --git a/tester/rcfiles/pauline_alt_rc b/tester/rcfiles/pauline_alt_rc index c8e730729..3eb1bfaa7 100644 --- a/tester/rcfiles/pauline_alt_rc +++ b/tester/rcfiles/pauline_alt_rc @@ -3,7 +3,7 @@ sip_port=-1 sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 -register_only_when_network_is_up=0 + [auth_info_0] username=pauline diff --git a/tester/rcfiles/pauline_h264_rc b/tester/rcfiles/pauline_h264_rc index 158f45fe5..92b4d7ec8 100644 --- a/tester/rcfiles/pauline_h264_rc +++ b/tester/rcfiles/pauline_h264_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/pauline_rc b/tester/rcfiles/pauline_rc index 50920606b..f2f2c94d5 100644 --- a/tester/rcfiles/pauline_rc +++ b/tester/rcfiles/pauline_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/pauline_rc_rtcp_xr b/tester/rcfiles/pauline_rc_rtcp_xr index 442804d73..57e48b7df 100644 --- a/tester/rcfiles/pauline_rc_rtcp_xr +++ b/tester/rcfiles/pauline_rc_rtcp_xr @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/pauline_sips_rc b/tester/rcfiles/pauline_sips_rc index f248cffc1..99b105a49 100644 --- a/tester/rcfiles/pauline_sips_rc +++ b/tester/rcfiles/pauline_sips_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/pauline_tcp_rc b/tester/rcfiles/pauline_tcp_rc index 284f0e776..ff36234b1 100644 --- a/tester/rcfiles/pauline_tcp_rc +++ b/tester/rcfiles/pauline_tcp_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 [auth_info_0] diff --git a/tester/rcfiles/pauline_wild_rc b/tester/rcfiles/pauline_wild_rc index 1d0d9b164..b0af339d3 100644 --- a/tester/rcfiles/pauline_wild_rc +++ b/tester/rcfiles/pauline_wild_rc @@ -3,7 +3,7 @@ sip_port=-1 sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 -register_only_when_network_is_up=0 + [auth_info_0] username=pauline diff --git a/tester/rcfiles/pauline_zrtp_aes256_rc b/tester/rcfiles/pauline_zrtp_aes256_rc index 5f1af185d..f2bea3c2e 100644 --- a/tester/rcfiles/pauline_zrtp_aes256_rc +++ b/tester/rcfiles/pauline_zrtp_aes256_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 zrtp_cipher_suites=MS_ZRTP_CIPHER_AES3,MS_ZRTP_CIPHER_AES1 diff --git a/tester/rcfiles/pauline_zrtp_b256_rc b/tester/rcfiles/pauline_zrtp_b256_rc index cf74f3fa7..c11cdab8b 100644 --- a/tester/rcfiles/pauline_zrtp_b256_rc +++ b/tester/rcfiles/pauline_zrtp_b256_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 zrtp_sas_suites=MS_ZRTP_SAS_B256 diff --git a/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc b/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc index b79b11874..74e313c1a 100644 --- a/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc +++ b/tester/rcfiles/pauline_zrtp_srtpsuite_aes256_rc @@ -4,7 +4,7 @@ sip_tcp_port=-1 sip_tls_port=-1 default_proxy=0 ping_with_options=0 -register_only_when_network_is_up=0 + composing_idle_timeout=1 srtp_crypto_suites=AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32