diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in_proto.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_icmp.c | 7 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 5 | ||||
| -rw-r--r-- | sys/netinet/ipsec_input.c | 7 | ||||
| -rw-r--r-- | sys/netinet6/icmp6.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/ip6protosw.h | 7 | ||||
| -rw-r--r-- | sys/sys/domain.h | 11 | ||||
| -rw-r--r-- | sys/sys/protosw.h | 5 |
10 files changed, 29 insertions, 34 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 5a4c38038dd..00fd4aa1eee 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_proto.c,v 1.58 2013/01/17 16:30:10 bluhm Exp $ */ +/* $OpenBSD: in_proto.c,v 1.59 2013/04/24 10:17:08 mpi Exp $ */ /* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* @@ -176,7 +176,7 @@ #include <netinet/ip_divert.h> #endif -extern struct domain inetdomain; +u_char ip_protox[IPPROTO_MAX]; struct protosw inetsw[] = { { 0, &inetdomain, 0, 0, diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index b0b976f04b1..7e1f03cc15a 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_icmp.c,v 1.97 2013/04/10 08:50:59 mpi Exp $ */ +/* $OpenBSD: ip_icmp.c,v 1.98 2013/04/24 10:17:08 mpi Exp $ */ /* $NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $ */ /* @@ -125,11 +125,6 @@ void icmp_mtudisc_timeout(struct rtentry *, struct rttimer *); int icmp_ratelimit(const struct in_addr *, const int, const int); void icmp_redirect_timeout(struct rtentry *, struct rttimer *); -/* from ip_input.c */ -extern u_char ip_protox[]; - -extern struct protosw inetsw[]; - void icmp_init(void) { diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index f6ca59131ae..d4fc1c38af1 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.209 2013/04/17 14:19:32 mpi Exp $ */ +/* $OpenBSD: ip_input.c,v 1.210 2013/04/24 10:17:08 mpi Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -121,9 +121,6 @@ extern struct baddynamicports baddynamicports; int *ipctl_vars[IPCTL_MAXID] = IPCTL_VARS; -extern struct domain inetdomain; -extern struct protosw inetsw[]; -u_char ip_protox[IPPROTO_MAX]; struct in_ifaddrhead in_ifaddr; struct ifqueue ipintrq; diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index b4af9a60fe4..af9946496f2 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.113 2013/04/11 12:06:25 mpi Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.114 2013/04/24 10:17:08 mpi Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -110,11 +110,6 @@ int *espctl_vars[ESPCTL_MAXID] = ESPCTL_VARS; int *ahctl_vars[AHCTL_MAXID] = AHCTL_VARS; int *ipcompctl_vars[IPCOMPCTL_MAXID] = IPCOMPCTL_VARS; -#ifdef INET6 -extern struct ip6protosw inet6sw[]; -extern u_char ip6_protox[]; -#endif - /* * ipsec_common_input() gets called when we receive an IPsec-protected packet * in IPv4 or IPv6. All it does is find the right TDB and call the appropriate diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 70f66f03b80..163f8305573 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.125 2013/04/10 01:35:55 guenther Exp $ */ +/* $OpenBSD: icmp6.c,v 1.126 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -129,10 +129,6 @@ */ #define in6p_ip6_nxt inp_ipv6.ip6_nxt -extern struct domain inet6domain; -extern struct ip6protosw inet6sw[]; -extern u_char ip6_protox[]; - struct icmp6stat icmp6stat; extern struct inpcbtable rawin6pcbtable; diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index e125974024d..008414fe4cb 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.66 2013/04/01 22:58:29 bluhm Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.67 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -122,8 +122,7 @@ /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. */ - -extern struct domain inet6domain; +u_char ip6_protox[IPPROTO_MAX]; struct ip6protosw inet6sw[] = { { 0, &inet6domain, IPPROTO_IPV6, 0, diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 36f7a70b87b..ce2a533f90e 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.111 2013/03/28 23:10:06 tedu Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.112 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -117,10 +117,6 @@ #include <netinet/ip_carp.h> #endif -extern struct domain inet6domain; -extern struct ip6protosw inet6sw[]; - -u_char ip6_protox[IPPROTO_MAX]; struct in6_ifaddrhead in6_ifaddr; struct ifqueue ip6intrq; diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h index e0fe753292b..cd732740c2b 100644 --- a/sys/netinet6/ip6protosw.h +++ b/sys/netinet6/ip6protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6protosw.h,v 1.7 2003/06/02 23:28:16 millert Exp $ */ +/* $OpenBSD: ip6protosw.h,v 1.8 2013/04/24 10:17:08 mpi Exp $ */ /* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */ /* @@ -142,4 +142,9 @@ struct ip6protosw { int (*pr_sysctl)(int *, u_int, void *, size_t *, void *, size_t); }; +#ifdef _KERNEL +extern u_char ip6_protox[]; +extern struct ip6protosw inet6sw[]; +#endif + #endif /* !_NETINET6_IP6PROTOSW_H_ */ diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 7f80bb826a2..9af839288c6 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -1,4 +1,4 @@ -/* $OpenBSD: domain.h,v 1.10 2012/09/15 00:47:08 guenther Exp $ */ +/* $OpenBSD: domain.h,v 1.11 2013/04/24 10:17:08 mpi Exp $ */ /* $NetBSD: domain.h,v 1.10 1996/02/09 18:25:07 christos Exp $ */ /* @@ -69,4 +69,13 @@ struct domain { #ifdef _KERNEL extern struct domain *domains; void domaininit(void); + +#ifdef INET +extern struct domain inetdomain; +#endif + +#ifdef INET6 +extern struct domain inet6domain; #endif + +#endif /* _KERNEL */ diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index d1bb2327d36..325cda58a0b 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: protosw.h,v 1.17 2011/07/04 16:02:07 guenther Exp $ */ +/* $OpenBSD: protosw.h,v 1.18 2013/04/24 10:17:08 mpi Exp $ */ /* $NetBSD: protosw.h,v 1.10 1996/04/09 20:55:32 cgd Exp $ */ /*- @@ -230,4 +230,7 @@ struct sockaddr; struct protosw *pffindproto(int, int, int); struct protosw *pffindtype(int, int); void pfctlinput(int, struct sockaddr *); + +extern u_char ip_protox[]; +extern struct protosw inetsw[]; #endif |