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

Add function to check if address is local 

Update the code to check all addresses for all interfaces. Move
the code from mbed_lwip_socket_bind() to a new function called
mbed_lwip_is_local_addr()
pull/5684/head
Juha Ylinen 2017-12-12 14:32:21 +02:00
parent 6d3e417eaa
commit 52353d2ede
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
features/FEATURE_LWIP/lwip-interface/lwip_stack.c
View File

@ -275,6 +275,37 @@ static const ip_addr_t *mbed_lwip_get_ipv6_addr(const struct netif *netif)
}
#endif
static bool mbed_lwip_is_local_addr(const ip_addr_t *ip_addr)
{
struct netif *netif;
for (netif = netif_list; netif != NULL; netif = netif->next) {
if (!netif_is_up(netif)) {
continue;
}
#if LWIP_IPV6
if (IP_IS_V6(ip_addr)) {
for (int i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
ip6_addr_cmp(netif_ip6_addr(netif, i), ip_addr)) {
return true;
}
}
}
#endif
#if LWIP_IPV4
if (IP_IS_V4(ip_addr)) {
if (!ip4_addr_isany(netif_ip4_addr(netif)) &&
ip4_addr_cmp(netif_ip_addr4(netif), ip_addr)) {
return true;
}
}
#endif
}
return false;
}
const ip_addr_t *mbed_lwip_get_ip_addr(bool any_addr, const struct netif *netif)
{
const ip_addr_t *pref_ip_addr = 0;
@ -992,31 +1023,9 @@ static nsapi_error_t mbed_lwip_socket_bind(nsapi_stack_t *stack, nsapi_socket_t
return NSAPI_ERROR_PARAMETER;
}
#if LWIP_IPV6
if (IP_IS_V6(ip_addr) && !ip6_addr_isany(&ip_addr)) {
const ip_addr_t *local_addr = mbed_lwip_get_ipv6_addr(&lwip_netif);
if (!local_addr) {
return NSAPI_ERROR_PARAMETER;
}
if (!ip6_addr_cmp(local_addr, &ip_addr)) {
return NSAPI_ERROR_PARAMETER;
}
if (!ip_addr_isany(&ip_addr) && !mbed_lwip_is_local_addr(&ip_addr)) {
return NSAPI_ERROR_PARAMETER;
}
#endif
#if LWIP_IPV4
if (IP_IS_V4(ip_addr) && !ip4_addr_isany(&ip_addr)) {
const ip_addr_t *local_addr = mbed_lwip_get_ipv4_addr(&lwip_netif);
if (!local_addr) {
return NSAPI_ERROR_PARAMETER;
}
if (!ip4_addr_cmp(local_addr, &ip_addr)) {
return NSAPI_ERROR_PARAMETER;
}
}
#endif
err_t err = netconn_bind(s->conn, &ip_addr, port);
return mbed_lwip_err_remap(err);