diff options
| author |   reyk <reyk@openbsd.org> | 2014-09-28 14:26:42 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2014-09-28 14:26:42 +0000 |
| commit | 595769cc1d80b08e2d2e05e04f1db6f1fa22530b (patch) | |
| tree | 3bbfb18d9d7e39d482539f83e0c019dd9572ccbc | |
| parent | Make the goressl regress test compile again. (diff) | |
| download | wireguard-openbsd-595769cc1d80b08e2d2e05e04f1db6f1fa22530b.tar.xz wireguard-openbsd-595769cc1d80b08e2d2e05e04f1db6f1fa22530b.zip | |
Remove a limitation that ignored IPv6 link-local addresses on carp(4).
This workaround was needed when the interface link-local address was
still enabled by default to prevent immediate state transition on
interfaces without any configured addresses. This is not needed
anymore and removing the limitation allows to use carp(4) with
addresses like fe80::2%carp0.
discussed with some
ok mpi@ pelikan@
| -rw-r--r-- | sys/netinet/ip_carp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 5f2749de832..ffa5ffe1f70 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.234 2014/09/08 06:24:13 jsg Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.235 2014/09/28 14:26:42 reyk Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -1807,8 +1807,7 @@ carp_addr_updated(void *v) if (ifa->ifa_addr->sa_family == AF_INET) new_naddrs++; #ifdef INET6 - else if (ifa->ifa_addr->sa_family == AF_INET6 && - !IN6_IS_ADDR_LINKLOCAL(&ifatoia6(ifa)->ia_addr.sin6_addr)) + else if (ifa->ifa_addr->sa_family == AF_INET6) new_naddrs6++; #endif /* INET6 */ } |