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

improve ipv6 selection when making outgoing call without prior register.

Browse source
This commit is contained in:
Simon Morlat 2016-09-21 16:02:42 +02:00
parent 56d52b8bac
commit 05d712ecdd
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
coreapi/linphonecall.c
View file

@ -1045,11 +1045,33 @@ void linphone_call_create_op(LinphoneCall *call){
**/
static void linphone_call_outgoing_select_ip_version(LinphoneCall *call, LinphoneAddress *to, LinphoneProxyConfig *cfg){
if (linphone_core_ipv6_enabled(call->core)){
call->af=AF_INET;
if (sal_address_is_ipv6((SalAddress*)to)){
call->af=AF_INET6;
}else if (cfg && cfg->op){
call->af=sal_op_is_ipv6(cfg->op) ? AF_INET6 : AF_INET;
}else{
char ipv4[LINPHONE_IPADDR_SIZE];
char ipv6[LINPHONE_IPADDR_SIZE];
bool_t have_ipv6 = FALSE;
bool_t have_ipv4 = FALSE;
/*check connectivity for IPv4 and IPv6*/
if (linphone_core_get_local_ip_for(AF_INET6, NULL, ipv6) == 0){
have_ipv6 = TRUE;
}
if (linphone_core_get_local_ip_for(AF_INET, NULL, ipv4) == 0){
have_ipv4 = TRUE;
}
if (have_ipv6){
if (!have_ipv4) {
call->af = AF_INET6;
}else if (lp_config_get_int(call->core->config, "rtp", "prefer_ipv6", 1)){ /*this property tells whether ipv6 is prefered if two versions are available*/
call->af = AF_INET6;
}else{
call->af = AF_INET;
}
}else call->af = AF_INET;
/*fill the media_localip default value since we have it here*/
strncpy(call->media_localip,call->af == AF_INET6 ? ipv6 : ipv4, LINPHONE_IPADDR_SIZE);
}
}else call->af=AF_INET;
}
@ -1107,8 +1129,9 @@ static void linphone_call_get_local_ip(LinphoneCall *call, const LinphoneAddress
}
if (res != NULL) freeaddrinfo(res);
}
/*the following cannot fail and puts result directly in media_localip*/
linphone_core_get_local_ip(call->core, af, dest, call->media_localip);
if (dest != NULL || call->media_localip[0] == '\0')
linphone_core_get_local_ip(call->core, af, dest, call->media_localip);
return;
found:
strncpy(call->media_localip,ip,LINPHONE_IPADDR_SIZE);

2
oRTP

@ -1 +1 @@
Subproject commit 574fb8b0a21b8b2fb6ff5e093d99d92519d47583
Subproject commit 9522d4f0d06bb41fd5c684804d5fdb665664bf03