mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-21 21:18:05 +00:00
fix compilation problem
set register_when_network_is_up to default value (1).
This commit is contained in:
parent
ed0ec8aabd
commit
f1c86b868b
25 changed files with 36 additions and 27 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue