remove some of cross-BSD portability #ifdef.
remove xxCTL_VARS, which is BSDI specific.
This commit is contained in:
itojun
parent
d28bd11715
commit
bbe25244d0
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: icmp6.h,v 1.5 2000/02/26 08:39:18 itojun Exp $ */
|
||||
/* $NetBSD: icmp6.h,v 1.6 2000/02/28 12:08:21 itojun Exp $ */
|
||||
/* $KAME: icmp6.h,v 1.6 2000/02/24 16:34:46 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -547,24 +547,6 @@ struct icmp6stat {
|
|||
{ "nodeinfo", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#define ICMPV6CTL_VARS { \
|
||||
0, \
|
||||
0, \
|
||||
&icmp6_rediraccept, \
|
||||
&icmp6_redirtimeout, \
|
||||
0, \
|
||||
0, \
|
||||
&icmp6errratelim, \
|
||||
&nd6_prune, \
|
||||
0, \
|
||||
&nd6_delay, \
|
||||
&nd6_umaxtries, \
|
||||
&nd6_mmaxtries, \
|
||||
&nd6_useloopback, \
|
||||
0, \
|
||||
&icmp6_nodeinfo, \
|
||||
}
|
||||
|
||||
#define RTF_PROBEMTU RTF_PROTO1
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6.c,v 1.21 2000/02/26 08:39:19 itojun Exp $ */
|
||||
/* $NetBSD: in6.c,v 1.22 2000/02/28 12:08:22 itojun Exp $ */
|
||||
/* $KAME: in6.c,v 1.55 2000/02/25 00:32:23 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -1742,11 +1742,7 @@ in6_ifawithscope(oifp, dst)
|
|||
* Comparing an interface with the outgoing interface will be done
|
||||
* only at the final stage of tiebreaking.
|
||||
*/
|
||||
#if defined(__bsdi__) || (defined(__FreeBSD__) && __FreeBSD__ < 3)
|
||||
for (ifp = ifnet; ifp; ifp = ifp->if_next)
|
||||
#else
|
||||
for (ifp = TAILQ_FIRST(&ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list))
|
||||
#endif
|
||||
{
|
||||
/*
|
||||
* We can never take an address that breaks the scope zone
|
||||
|
|
@ -1755,12 +1751,8 @@ in6_ifawithscope(oifp, dst)
|
|||
if (in6_addr2scopeid(ifp, dst) != in6_addr2scopeid(oifp, dst))
|
||||
continue;
|
||||
|
||||
#if defined(__bsdi__) || (defined(__FreeBSD__) && __FreeBSD__ < 3)
|
||||
for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next)
|
||||
#else
|
||||
for (ifa = ifp->if_addrlist.tqh_first; ifa;
|
||||
ifa = ifa->ifa_list.tqe_next)
|
||||
#endif
|
||||
{
|
||||
int tlen = -1, dscopecmp, bscopecmp, matchcmp;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: in6.h,v 1.12 2000/02/19 17:32:07 itojun Exp $ */
|
||||
/* $NetBSD: in6.h,v 1.13 2000/02/28 12:08:22 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
|
|
@ -557,33 +557,6 @@ struct in6_pktinfo {
|
|||
{ "bindv6only", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#define IPV6CTL_VARS { \
|
||||
0, \
|
||||
&ip6_forwarding, \
|
||||
&ip6_sendredirects, \
|
||||
&ip6_defhlim, \
|
||||
0, \
|
||||
&ip6_forward_srcrt, \
|
||||
0, \
|
||||
0, \
|
||||
0, \
|
||||
&ip6_maxfragpackets, \
|
||||
&ip6_sourcecheck, \
|
||||
&ip6_sourcecheck_interval, \
|
||||
&ip6_accept_rtadv, \
|
||||
&ip6_keepfaith, \
|
||||
&ip6_log_interval, \
|
||||
&ip6_hdrnestlimit, \
|
||||
&ip6_dad_count, \
|
||||
&ip6_auto_flowlabel, \
|
||||
&ip6_defmcasthlim, \
|
||||
&ip6_gif_hlim, \
|
||||
0, \
|
||||
&ip6_use_deprecated, \
|
||||
&ip6_rr_prune, \
|
||||
0, \
|
||||
&ip6_bindv6only, \
|
||||
}
|
||||
#endif /* !_XOPEN_SOURCE */
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ipsec.c,v 1.16 2000/02/25 00:29:55 itojun Exp $ */
|
||||
/* $NetBSD: ipsec.c,v 1.17 2000/02/28 12:08:23 itojun Exp $ */
|
||||
/* $KAME: ipsec.c,v 1.49 2000/02/23 08:52:52 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -3221,8 +3221,6 @@ u_char ipsecctlermap[PRC_NCMDS] = {
|
|||
ENOPROTOOPT
|
||||
};
|
||||
|
||||
int *ipsec_sysvars[] = IPSECCTL_VARS;
|
||||
|
||||
int
|
||||
ipsec_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
|
||||
int *name;
|
||||
|
|
@ -3317,8 +3315,6 @@ u_char ipsec6ctlermap[PRC_NCMDS] = {
|
|||
ENOPROTOOPT
|
||||
};
|
||||
|
||||
int *ipsec6_sysvars[] = IPSEC6CTL_VARS;
|
||||
|
||||
int
|
||||
ipsec6_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
|
||||
int *name;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ipsec.h,v 1.10 2000/02/06 12:49:47 itojun Exp $ */
|
||||
/* $NetBSD: ipsec.h,v 1.11 2000/02/28 12:08:24 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
|
|
@ -239,38 +239,6 @@ struct ipsecstat {
|
|||
{ "debug", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#define IPSECCTL_VARS { \
|
||||
0, \
|
||||
0, \
|
||||
&ip4_def_policy.policy, \
|
||||
&ip4_esp_trans_deflev, \
|
||||
&ip4_esp_net_deflev, \
|
||||
&ip4_ah_trans_deflev, \
|
||||
&ip4_ah_net_deflev, \
|
||||
&ip4_inbound_call_ike, \
|
||||
&ip4_ah_cleartos, \
|
||||
&ip4_ah_offsetmask, \
|
||||
&ip4_ipsec_dfbit, \
|
||||
&ip4_ipsec_ecn, \
|
||||
&ipsec_debug, \
|
||||
}
|
||||
|
||||
#define IPSEC6CTL_VARS { \
|
||||
0, \
|
||||
0, \
|
||||
&ip6_def_policy.policy, \
|
||||
&ip6_esp_trans_deflev, \
|
||||
&ip6_esp_net_deflev, \
|
||||
&ip6_ah_trans_deflev, \
|
||||
&ip6_ah_net_deflev, \
|
||||
&ip6_inbound_call_ike, \
|
||||
0, \
|
||||
0, \
|
||||
0, \
|
||||
&ip6_ipsec_ecn, \
|
||||
&ipsec_debug, \
|
||||
}
|
||||
|
||||
#ifdef _KERNEL
|
||||
struct ipsec_output_state {
|
||||
struct mbuf *m;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nd6.c,v 1.18 2000/02/26 08:39:20 itojun Exp $ */
|
||||
/* $NetBSD: nd6.c,v 1.19 2000/02/28 12:08:24 itojun Exp $ */
|
||||
/* $KAME: nd6.c,v 1.41 2000/02/24 16:34:50 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -777,11 +777,7 @@ nd6_free(rt)
|
|||
|
||||
if (!ip6_forwarding && ip6_accept_rtadv) { /* XXX: too restrictive? */
|
||||
int s;
|
||||
#ifdef __NetBSD__
|
||||
s = splsoftnet();
|
||||
#else
|
||||
s = splnet();
|
||||
#endif
|
||||
dr = defrouter_lookup(&((struct sockaddr_in6 *)rt_key(rt))->sin6_addr,
|
||||
rt->rt_ifp);
|
||||
if (ln->ln_router || dr) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nd6_nbr.c,v 1.16 2000/02/26 08:39:20 itojun Exp $ */
|
||||
/* $NetBSD: nd6_nbr.c,v 1.17 2000/02/28 12:08:24 itojun Exp $ */
|
||||
/* $KAME: nd6_nbr.c,v 1.28 2000/02/26 06:53:11 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -198,11 +198,7 @@ nd6_ns_input(m, off, icmp6len)
|
|||
tsin6.sin6_family = AF_INET6;
|
||||
tsin6.sin6_addr = taddr6;
|
||||
|
||||
rt = rtalloc1((struct sockaddr *)&tsin6, 0
|
||||
#ifdef __FreeBSD__
|
||||
, 0
|
||||
#endif /* __FreeBSD__ */
|
||||
);
|
||||
rt = rtalloc1((struct sockaddr *)&tsin6, 0);
|
||||
if (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 &&
|
||||
rt->rt_gateway->sa_family == AF_LINK) {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: udp6_var.h,v 1.6 2000/01/06 15:46:11 itojun Exp $ */
|
||||
/* $NetBSD: udp6_var.h,v 1.7 2000/02/28 12:08:25 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
|
|
@ -98,12 +98,6 @@ struct udp6stat {
|
|||
{ "recvspace", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#define UDP6CTL_VARS { \
|
||||
0, \
|
||||
&udp6_sendspace, \
|
||||
&udp6_recvspace, \
|
||||
}
|
||||
|
||||
#ifdef _KERNEL
|
||||
struct in6pcb udb6;
|
||||
struct udp6stat udp6stat;
|
||||
|
|
|
|||
Loading…
Reference in New Issue