SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-08-08 00:42:18 +00:00
parent 691f97cc10
commit 371ae113c6
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
175 changed files with 2932 additions and 1512 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sys/netinet6/nd6_nbr.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: nd6_nbr.c,v 1.150 2023/07/29 15:59:27 krw Exp $ */
/* $OpenBSD: nd6_nbr.c,v 1.151 2023/07/30 12:52:03 krw Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@ -1158,21 +1158,24 @@ nd6_dad_stop(struct ifaddr *ifa)
void
nd6_dad_timer(void *xifa)
{
struct ifaddr *ifa = xifa;
struct in6_ifaddr *ia6 = ifatoia6(ifa);
struct ifaddr *ifa;
struct in6_ifaddr *ia6;
struct in6_addr daddr6, taddr6;
struct ifnet *ifp = ifa->ifa_ifp;
struct ifnet *ifp;
struct dadq *dp;
char addr[INET6_ADDRSTRLEN];
NET_LOCK();
/* Sanity check */
if (ia6 == NULL) {
if (xifa == NULL) {
log(LOG_ERR, "%s: called with null parameter\n", __func__);
goto done;
}
ifa = xifa;
ia6 = ifatoia6(ifa);
taddr6 = ia6->ia_addr.sin6_addr;
ifp = ifa->ifa_ifp;
dp = nd6_dad_find(ifa);
if (dp == NULL) {
log(LOG_ERR, "%s: DAD structure not found\n", __func__);