ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request from Jookia/RFC_ipv6fix 

LWIP::get_ip_addr: Prefer IPv4 over IPv6 link local addresses
pull/15430/head
Martin Kojtal 2023-05-30 10:25:28 +01:00 committed by GitHub
parent 3a08a4582c 06593d3d68
commit 95f3f93c19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
connectivity/lwipstack/source

9
connectivity/lwipstack/source/lwip_tools.cpp
View File

@ -110,12 +110,6 @@ const ip_addr_t *LWIP::get_ipv6_addr(const struct netif *netif)
return netif_ip_addr6(netif, i);
}
}
for (int i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) {
return netif_ip_addr6(netif, i);
}
}
#endif
return NULL;
}
@ -164,6 +158,9 @@ const ip_addr_t *LWIP::get_ip_addr(bool any_addr, const struct netif *netif)
pref_ip_addr = get_ipv6_addr(netif);
npref_ip_addr = get_ipv4_addr(netif);
#endif
if (!npref_ip_addr) {
npref_ip_addr = get_ipv6_link_local_addr(netif);
}
#elif LWIP_IPV6
pref_ip_addr = get_ipv6_addr(netif);
#elif LWIP_IPV4