mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-05 12:56:08 +00:00
Code Issues Releases Activity

Fix IPv6 regression introduced by r362900.

Browse Source 
PR:		kern/247729
This commit is contained in:
Alexander V. Chernikov 2020-07-03 08:06:26 +00:00
parent 606007409c
commit eddfb2e86f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=362909
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netinet6/icmp6.c
View File

@ -2277,7 +2277,7 @@ icmp6_redirect_input(struct mbuf *m, int off)
in6_splitscope(&reddst6, &kdst, &scopeid); in6_splitscope(&reddst6, &kdst, &scopeid);
NET_EPOCH_ASSERT(); NET_EPOCH_ASSERT();
nh = fib6_lookup(ifp->if_fib, &kdst, scopeid, 0, 0); nh = fib6_lookup(ifp->if_fib, &kdst, scopeid, 0, 0);
if (nh == NULL) { if (nh != NULL) {
struct in6_addr nh_addr; struct in6_addr nh_addr;
nh_addr = ifatoia6(nh->nh_ifa)->ia_addr.sin6_addr; nh_addr = ifatoia6(nh->nh_ifa)->ia_addr.sin6_addr;
if ((nh->nh_flags & NHF_GATEWAY) == 0) { if ((nh->nh_flags & NHF_GATEWAY) == 0) {

10
tests/sys/netinet6/redirect.sh
View File

@ -87,7 +87,15 @@ valid_redirect_body() {
local_ll_mac=`jexec ${jname} ifconfig ${epair}b ether | awk '$1~/ether/{print$2}'` local_ll_mac=`jexec ${jname} ifconfig ${epair}b ether | awk '$1~/ether/{print$2}'`
# wait for DAD to complete # wait for DAD to complete
sleep 2 while [ `ifconfig ${epair}a inet6 | grep -c tentative` != "0" ]; do
sleep 0.1
done
while [ `jexec ${jname}b ifconfig ${epair}b inet6 | grep -c tentative` != "0" ]; do
sleep 0.1
done
# enable ND debugging in the target jail to ease catching errors
jexec ${jname} sysctl net.inet6.icmp6.nd6_debug=1
# echo "LOCAL: ${local_ll_ip} ${local_ll_mac}" # echo "LOCAL: ${local_ll_ip} ${local_ll_mac}"
# echo "REMOTE: ${remote_rtr_ll_ip} ${remote_rtr_mac}" # echo "REMOTE: ${remote_rtr_ll_ip} ${remote_rtr_mac}"