patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: ipv4: Fix subnet mask setting when autoconf is used

Browse source 
When IPv4 autoconf is enabled and IPv4 LL address is configured on an
interface, the subnet mask should be updated accordingly, otherwise it
can lead to unexpected behaviour (like for example not identifying peer
LL address as a part of the same subnet).

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2023-01-10 15:16:39 +01:00 committed by Carles Cufí
parent b3eeb91869
commit f39ba57474
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
subsys/net/ip/ipv4_autoconf.c
View file

@ -161,6 +161,32 @@ enum net_verdict net_ipv4_autoconf_input(struct net_if *iface,
return NET_DROP;
}
static inline void ipv4_autoconf_addr_set(struct net_if_ipv4_autoconf *ipv4auto)
{
struct in_addr netmask = { { { 255, 255, 0, 0 } } };
if (ipv4auto->announce_cnt <=
(IPV4_AUTOCONF_ANNOUNCE_NUM - 1)) {
net_ipaddr_copy(&ipv4auto->current_ip,
&ipv4auto->requested_ip);
ipv4_autoconf_send_announcement(ipv4auto);
return;
}
/* Success, add new IPv4 address. */
if (!net_if_ipv4_addr_add(ipv4auto->iface,
&ipv4auto->requested_ip,
NET_ADDR_AUTOCONF, 0)) {
NET_DBG("Failed to add IPv4 addr to iface %p",
ipv4auto->iface);
return;
}
net_if_ipv4_set_netmask(ipv4auto->iface, &netmask);
ipv4auto->state = NET_IPV4_AUTOCONF_ASSIGNED;
}
static void ipv4_autoconf_send(struct net_if_ipv4_autoconf *ipv4auto)
{
switch (ipv4auto->state) {
@ -197,25 +223,9 @@ static void ipv4_autoconf_send(struct net_if_ipv4_autoconf *ipv4auto)
}
__fallthrough;
case NET_IPV4_AUTOCONF_ANNOUNCE:
if (ipv4auto->announce_cnt <=
(IPV4_AUTOCONF_ANNOUNCE_NUM - 1)) {
net_ipaddr_copy(&ipv4auto->current_ip,
&ipv4auto->requested_ip);
ipv4_autoconf_send_announcement(ipv4auto);
break;
}
/* success, add new IPv4 address */
if (!net_if_ipv4_addr_add(ipv4auto->iface,
&ipv4auto->requested_ip,
NET_ADDR_AUTOCONF, 0)) {
NET_DBG("Failed to add IPv4 addr to iface %p",
ipv4auto->iface);
return;
}
ipv4auto->state = NET_IPV4_AUTOCONF_ASSIGNED;
ipv4_autoconf_addr_set(ipv4auto);
break;
default:
break;
}