From d2924ce85f964725527e58978d39bf95a72c42a1 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Wed, 23 Oct 2013 15:12:43 +0000 Subject: Remove the number of in_var.h inclusions by moving some functions and global variables to in.h. ok mikeb@, deraadt@ --- sys/netinet/in.h | 10 ++++++++-- sys/netinet/in_var.h | 9 +-------- sys/netinet/ip_gre.c | 3 +-- sys/netinet/ip_ipip.c | 3 +-- sys/netinet/ip_mroute.c | 3 +-- sys/netinet/ip_spd.c | 3 +-- sys/netinet/ipsec_input.c | 3 +-- sys/netinet/tcp_subr.c | 3 +-- 8 files changed, 15 insertions(+), 22 deletions(-) (limited to 'sys/netinet') diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 0598ed96fc6..42b2728e8b9 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.99 2013/10/23 13:39:35 mpi Exp $ */ +/* $OpenBSD: in.h,v 1.100 2013/10/23 15:12:42 mpi Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -824,6 +824,8 @@ in_cksum_addword(u_int16_t a, u_int16_t b) return (sum); } +extern int inetctlerrmap[]; +extern struct ifqueue ipintrq; /* ip packet input queue */ extern struct in_addr zeroin_addr; int in_broadcast(struct in_addr, struct ifnet *, u_int); @@ -832,9 +834,13 @@ int in_cksum(struct mbuf *, int); int in4_cksum(struct mbuf *, u_int8_t, int, int); void in_delayed_cksum(struct mbuf *); int in_localaddr(struct in_addr, u_int); -char *inet_ntoa(struct in_addr); void in_proto_cksum_out(struct mbuf *, struct ifnet *); void in_ifdetach(struct ifnet *); +int in_mask2len(struct in_addr *); + +char *inet_ntoa(struct in_addr); +int inet_nat64(int, const void *, void *, const void *, u_int8_t); +int inet_nat46(int, const void *, void *, const void *, u_int8_t); #define in_hosteq(s,t) ((s).s_addr == (t).s_addr) #define in_nullhost(x) ((x).s_addr == INADDR_ANY) diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 88b593ea058..249966bb78a 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_var.h,v 1.25 2013/10/23 13:39:35 mpi Exp $ */ +/* $OpenBSD: in_var.h,v 1.26 2013/10/23 15:12:42 mpi Exp $ */ /* $NetBSD: in_var.h,v 1.16 1996/02/13 23:42:15 christos Exp $ */ /* @@ -83,9 +83,6 @@ struct in_aliasreq { #ifdef _KERNEL TAILQ_HEAD(in_ifaddrhead, in_ifaddr); extern struct in_ifaddrhead in_ifaddr; -extern struct ifqueue ipintrq; /* ip packet input queue */ -extern int inetctlerrmap[]; - /* * Macro for finding the interface (ifnet structure) corresponding to one @@ -182,10 +179,6 @@ struct in_multi *in_addmulti(struct in_addr *, struct ifnet *); void in_delmulti(struct in_multi *); void in_ifscrub(struct ifnet *, struct in_ifaddr *); int in_control(struct socket *, u_long, caddr_t, struct ifnet *); - -int inet_nat64(int, const void *, void *, const void *, u_int8_t); -int inet_nat46(int, const void *, void *, const void *, u_int8_t); -int in_mask2len(struct in_addr *); #endif #endif /* _NETINET_IN_VAR_H_ */ diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 50e1bb8271f..2a6e3a8e079 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.45 2013/10/17 16:27:44 bluhm Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.46 2013/10/23 15:12:42 mpi Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -55,7 +55,6 @@ #ifdef INET #include -#include #include #include #include diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c index 708d134783e..4181361edde 100644 --- a/sys/netinet/ip_ipip.c +++ b/sys/netinet/ip_ipip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipip.c,v 1.49 2013/10/17 16:27:44 bluhm Exp $ */ +/* $OpenBSD: ip_ipip.c,v 1.50 2013/10/23 15:12:42 mpi Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -57,7 +57,6 @@ #include #include #include -#include #include #include diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 4f5cc91ad41..a2c5ce349c7 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.61 2013/05/02 11:54:10 mpi Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.62 2013/10/23 15:12:42 mpi Exp $ */ /* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */ /* @@ -79,7 +79,6 @@ #include #include -#include #include #include #include diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c index f563c8266a0..66fa68c37c4 100644 --- a/sys/netinet/ip_spd.c +++ b/sys/netinet/ip_spd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_spd.c,v 1.67 2013/05/14 14:29:08 mpi Exp $ */ +/* $OpenBSD: ip_spd.c,v 1.68 2013/10/23 15:12:42 mpi Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -40,7 +40,6 @@ #include #include #include -#include #endif /* INET */ #ifdef INET6 diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index 3e99bc30653..d503816c75b 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.116 2013/10/17 16:27:44 bluhm Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.117 2013/10/23 15:12:42 mpi Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c2143fb161b..a4107481eea 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.123 2013/10/21 08:42:24 phessler Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.124 2013/10/23 15:12:42 mpi Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -84,7 +84,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3