diff options
| author | cmetz <cmetz@cvs.openbsd.org> | 1999-03-09 05:31:56 +0000 |
|---|---|---|
| committer | cmetz <cmetz@cvs.openbsd.org> | 1999-03-09 05:31:56 +0000 |
| commit | c17820c2d223c38e9b24af57e8e93304133580c5 (patch) | |
| tree | 078025a176d45d7638cee69e3ba767edd26c7223 /sys/netinet6/ipv6_discovery.c | |
| parent | e25d73e4b2f1e9be6806cea63cd0836e3097457f (diff) | |
Demangled the INET6 stuff so as not to require any extra options and not to
be mutually exclusive with the IPSEC option.
Diffstat (limited to 'sys/netinet6/ipv6_discovery.c')
| -rw-r--r-- | sys/netinet6/ipv6_discovery.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/sys/netinet6/ipv6_discovery.c b/sys/netinet6/ipv6_discovery.c index 7f0cfc9340c..b5b2506408d 100644 --- a/sys/netinet6/ipv6_discovery.c +++ b/sys/netinet6/ipv6_discovery.c @@ -39,29 +39,36 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #include <netinet6/ipv6_var.h> #include <netinet6/ipv6_icmp.h> -#ifdef DEBUG_NRL_SYS -#include <sys/debug.h> -#endif /* DEBUG_NRL_SYS */ -#ifdef DEBUG_NRL_NETINET6 -#include <netinet6/debug.h> -#endif /* DEBUG_NRL_NETINET6 */ - -#if __OpenBSD__ && defined(NRL_IPSEC) +#if __OpenBSD__ +#ifdef IPSEC +#undef IPSEC +#endif /* IPSEC */ +#ifdef NRL_IPSEC #define IPSEC 1 -#endif /* __OpenBSD__ && defined(NRL_IPSEC) */ +#endif /* NRL_IPSEC */ +#endif /* __OpenBSD__ */ #ifdef IPSEC -#include <netsec/ipsec.h> +/* #include <netsec/ipsec.h> */ +#include <net/netproc.h> +#include <net/netproc_var.h> #endif /* IPSEC */ #if defined(_BSDI_VERSION) && (_BSDI_VERSION >= 199802) #include <machine/pcpu.h> #endif /* defined(_BSDI_VERSION) && (_BSDI_VERSION >= 199802) */ -#ifdef IPSEC -#include <net/netproc.h> -#include <net/netproc_var.h> +#ifdef DEBUG_NRL +#include <sys/debug.h> +#else /* DEBUG_NRL */ +#if __OpenBSD__ +#include <netinet6/debug.h> +#else /* __OpenBSD__ */ +#include <sys/debug.h> +#endif /* __OpenBSD__ */ +#endif /* DEBUG_NRL */ +#ifdef IPSEC extern struct netproc_security fixedencrypt; extern struct netproc_auth fixedauth; #endif /* IPSEC */ |