michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: ip: use default interface while matching LL src address

Browse source 
While matching source address for a given Link-Local destination the
functions iterate over interfaces and return a first result with a
valid LL-address. However, they should first try to fetch address of
the default interface as it not always the first one on the list.

Signed-off-by: Konrad Derda <konrad.derda@nordicsemi.no>
This commit is contained in:
Konrad Derda 2023-09-12 21:33:38 +02:00 • committed by Fabio Baltieri
commit b3a3a8b3a2
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
subsys/net/ip/net_if.c
View file

@ -2890,9 +2890,15 @@ const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *dst_iface,
if (dst_iface) {
src = net_if_ipv6_get_ll(dst_iface, NET_ADDR_PREFERRED);
} else {
STRUCT_SECTION_FOREACH(net_if, iface) {
struct in6_addr *addr;
struct in6_addr *addr;
addr = net_if_ipv6_get_ll(net_if_get_default(), NET_ADDR_PREFERRED);
if (addr) {
src = addr;
goto out;
}
STRUCT_SECTION_FOREACH(net_if, iface) {
addr = net_if_ipv6_get_ll(iface,
NET_ADDR_PREFERRED);
if (addr) {
@ -2905,7 +2911,6 @@ const struct in6_addr *net_if_ipv6_select_src_addr(struct net_if *dst_iface,
if (!src) {
src = net_ipv6_unspecified_address();
goto out;
}
out:
@ -3427,9 +3432,15 @@ const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface,
if (dst_iface) {
src = net_if_ipv4_get_ll(dst_iface, NET_ADDR_PREFERRED);
} else {
STRUCT_SECTION_FOREACH(net_if, iface) {
struct in_addr *addr;
struct in_addr *addr;
addr = net_if_ipv4_get_ll(net_if_get_default(), NET_ADDR_PREFERRED);
if (addr) {
src = addr;
goto out;
}
STRUCT_SECTION_FOREACH(net_if, iface) {
addr = net_if_ipv4_get_ll(iface,
NET_ADDR_PREFERRED);
if (addr) {
@ -3454,8 +3465,6 @@ const struct in_addr *net_if_ipv4_select_src_addr(struct net_if *dst_iface,
if (!src) {
src = net_ipv4_unspecified_address();
}
goto out;
}
out: