diff options
| author |   mpi <mpi@openbsd.org> | 2015-07-16 15:28:38 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-07-16 15:28:38 +0000 |
| commit | bdf001381ad16dc852e7cca1804e1fa14df252af (patch) | |
| tree | 93f2559cce8db16b63ad8879b46b34b499abd67f | |
| parent | fix coverity leak - ID 78921 (diff) | |
| download | wireguard-openbsd-bdf001381ad16dc852e7cca1804e1fa14df252af.tar.xz wireguard-openbsd-bdf001381ad16dc852e7cca1804e1fa14df252af.zip | |
Kill incorrect and never set ``dad_ignore_ns'' button.
ok phessler@
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index a6b28034486..c393173e836 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.90 2015/06/16 11:09:40 mpi Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.91 2015/07/16 15:28:38 mpi Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -83,7 +83,6 @@ void nd6_dad_ns_output(struct dadq *, struct ifaddr *); void nd6_dad_ns_input(struct ifaddr *); void nd6_dad_duplicated(struct dadq *); -static int dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ static int dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ /* @@ -1419,18 +1418,6 @@ nd6_dad_ns_input(struct ifaddr *ifa) duplicate = 0; dp = nd6_dad_find(ifa); - /* Quickhack - completely ignore DAD NS packets */ - if (dad_ignore_ns) { - char addr[INET6_ADDRSTRLEN]; - - nd6log((LOG_INFO, - "nd6_dad_ns_input: ignoring DAD NS packet for " - "address %s(%s)\n", - inet_ntop(AF_INET6, taddr6, addr, sizeof(addr)), - ifa->ifa_ifp->if_xname)); - return; - } - /* * if I'm yet to start DAD, someone else started using this address * first. I have a duplicate and you win. |