diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2015-07-17 18:31:09 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2015-07-17 18:31:09 +0000 |
| commit | 534b943081957c2ee1e52295eb7e53d493df375d (patch) | |
| tree | efed1df13bc84db12bafa7d2a08c09db318bd1a0 /sys/kern/uipc_domain.c | |
| parent | cb6f4e423cb7ac2293ab020e0bc078fb2c29778f (diff) | |
manage spd entries by using the radix api directly instead of
reaching around through the routing table
original diff by myself, much improved by mikeb@ and mpi@
ok and testing mikeb@ mpi@
Diffstat (limited to 'sys/kern/uipc_domain.c')
| -rw-r--r-- | sys/kern/uipc_domain.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 5ec1a8d3c1c..65cf5eadea0 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.40 2015/03/14 03:38:51 jsg Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.41 2015/07/17 18:31:08 blambert Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -51,10 +51,6 @@ void pffasttimo(void *); void pfslowtimo(void *); struct domain * pffinddomain(int); -#if defined (KEY) || defined (IPSEC) || defined (TCP_SIGNATURE) -int pfkey_init(void); -#endif /* KEY || IPSEC || TCP_SIGNATURE */ - #define ADDDOMAIN(x) { \ extern struct domain __CONCAT(x,domain); \ __CONCAT(x,domain.dom_next) = domains; \ @@ -80,15 +76,10 @@ domaininit(void) ADDDOMAIN(inet6); #endif /* INET6 */ #if defined (KEY) || defined (IPSEC) || defined (TCP_SIGNATURE) - pfkey_init(); -#endif /* KEY || IPSEC */ -#ifdef MPLS - ADDDOMAIN(mpls); -#endif -#ifdef IPSEC -#ifdef __KAME__ - ADDDOMAIN(key); + ADDDOMAIN(pfkey); #endif +#ifdef MPLS + ADDDOMAIN(mpls); #endif ADDDOMAIN(route); |