diff options
| author |   mcbride <mcbride@openbsd.org> | 2004-12-07 20:38:46 +0000 |
|---|---|---|
| committer | mcbride <mcbride@openbsd.org> | 2004-12-07 20:38:46 +0000 |
| commit | f8e109fa9051a27bf395da41c947e331d5ad2de7 (patch) | |
| tree | 7de984f01c1082a614443c140651c6c344d7b742 /sys/netinet6 | |
| parent | KNF (diff) | |
| download | wireguard-openbsd-f8e109fa9051a27bf395da41c947e331d5ad2de7.tar.xz wireguard-openbsd-f8e109fa9051a27bf395da41c947e331d5ad2de7.zip | |
Convert carp(4) to behave more like a regular interface, much in the same
style as vlan(4). carp interfaces no longer require the physical interface
to be on the same subnet as the carp interface, or even that the physical
interface has an adress at all, so CARP can now be used on /30 networks.
ok deraadt@ henning@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 3 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index bbad7370ff5..7d4b35ab0df 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.36 2004/05/07 14:42:27 millert Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.37 2004/12/07 20:38:47 mcbride Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -577,6 +577,7 @@ in6_ifattach(ifp, altifp) case IFT_ENC: case IFT_PFLOG: case IFT_PFSYNC: + case IFT_CARP: return; case IFT_PROPVIRTUAL: if (strncmp("bridge", ifp->if_xname, sizeof("bridge")) == 0 && diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 3b28dda50ae..e2f58077c21 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.45 2004/10/18 03:59:33 itojun Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.46 2004/12/07 20:38:47 mcbride Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -220,7 +220,7 @@ struct ip6protosw inet6sw[] = { }, #if NCARP > 0 { SOCK_RAW, &inet6domain, IPPROTO_CARP, PR_ATOMIC|PR_ADDR, - carp6_input, rip6_output, 0, rip6_ctloutput, + carp6_proto_input, rip6_output, 0, rip6_ctloutput, rip6_usrreq, 0, 0, 0, 0, carp_sysctl }, |