Module Name: src
Committed By: riastradh
Date: Fri Aug 28 07:01:57 UTC 2020
Modified Files:
src/sys/netinet: in_pcb.h in_pcb_hdr.h in_systm.h ip.h
Log Message:
netinet: Include the needful so include order doesn't matter.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/netinet/in_pcb.h
cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/in_pcb_hdr.h
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/in_systm.h
cvs rdiff -u -r1.34 -r1.35 src/sys/netinet/ip.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in_pcb.h
diff -u src/sys/netinet/in_pcb.h:1.67 src/sys/netinet/in_pcb.h:1.68
--- src/sys/netinet/in_pcb.h:1.67 Thu Aug 20 21:21:32 2020
+++ src/sys/netinet/in_pcb.h Fri Aug 28 07:01:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.h,v 1.67 2020/08/20 21:21:32 riastradh Exp $ */
+/* $NetBSD: in_pcb.h,v 1.68 2020/08/28 07:01:57 riastradh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -63,9 +63,16 @@
#ifndef _NETINET_IN_PCB_H_
#define _NETINET_IN_PCB_H_
-#include <sys/queue.h>
+#include <sys/types.h>
+
#include <net/route.h>
+
+#include <netinet/in.h>
#include <netinet/in_pcb_hdr.h>
+#include <netinet/ip.h>
+
+struct ip_moptions;
+struct mbuf;
/*
* Common structure pcb for internet protocol implementation.
@@ -133,6 +140,17 @@ struct inpcb {
#define inp_locked(inp) solocked((inp)->inp_socket)
#ifdef _KERNEL
+
+#include <sys/kauth.h>
+#include <sys/queue.h>
+
+struct inpcbtable;
+struct lwp;
+struct rtentry;
+struct sockaddr_in;
+struct socket;
+struct vestigial_inpcb;
+
void in_losing(struct inpcb *);
int in_pcballoc(struct socket *, void *);
int in_pcbbindableaddr(struct sockaddr_in *, kauth_cred_t);
@@ -173,6 +191,7 @@ in_pcb_register_overudp_cb(struct inpcb
inp->inp_overudp_cb = cb;
inp->inp_overudp_arg = arg;
}
-#endif
-#endif /* !_NETINET_IN_PCB_H_ */
+#endif /* _KERNEL */
+
+#endif /* !_NETINET_IN_PCB_H_ */
Index: src/sys/netinet/in_pcb_hdr.h
diff -u src/sys/netinet/in_pcb_hdr.h:1.14 src/sys/netinet/in_pcb_hdr.h:1.15
--- src/sys/netinet/in_pcb_hdr.h:1.14 Thu Aug 20 21:21:32 2020
+++ src/sys/netinet/in_pcb_hdr.h Fri Aug 28 07:01:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb_hdr.h,v 1.14 2020/08/20 21:21:32 riastradh Exp $ */
+/* $NetBSD: in_pcb_hdr.h,v 1.15 2020/08/28 07:01:57 riastradh Exp $ */
/*
* Copyright (C) 2003 WIDE Project.
@@ -63,9 +63,16 @@
#ifndef _NETINET_IN_PCB_HDR_H_
#define _NETINET_IN_PCB_HDR_H_
+#include <sys/types.h>
#include <sys/queue.h>
+#include <netinet/in.h>
+
struct inpcbpolicy;
+struct inpcbtable;
+struct mbuf;
+struct sockaddr;
+struct socket;
/*
* align it with inpcb and in6pcb!
Index: src/sys/netinet/in_systm.h
diff -u src/sys/netinet/in_systm.h:1.13 src/sys/netinet/in_systm.h:1.14
--- src/sys/netinet/in_systm.h:1.13 Sat Dec 10 23:36:23 2005
+++ src/sys/netinet/in_systm.h Fri Aug 28 07:01:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: in_systm.h,v 1.13 2005/12/10 23:36:23 elad Exp $ */
+/* $NetBSD: in_systm.h,v 1.14 2020/08/28 07:01:57 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -39,6 +39,8 @@
* definitions for kernel.
*/
+#include <sys/types.h>
+
/*
* Network types.
*
Index: src/sys/netinet/ip.h
diff -u src/sys/netinet/ip.h:1.34 src/sys/netinet/ip.h:1.35
--- src/sys/netinet/ip.h:1.34 Fri Nov 2 21:07:07 2012
+++ src/sys/netinet/ip.h Fri Aug 28 07:01:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip.h,v 1.34 2012/11/02 21:07:07 christos Exp $ */
+/* $NetBSD: ip.h,v 1.35 2020/08/28 07:01:57 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -34,7 +34,11 @@
#ifndef _NETINET_IP_H_
#define _NETINET_IP_H_
+#include <sys/types.h>
+
+#include <netinet/in.h>
#include <netinet/in_systm.h> /* for n_time */
+
/*
* Definitions for internet protocol version 4.
* Per RFC 791, September 1981.
@@ -243,4 +247,5 @@ struct ippseudo {
u_int8_t ippseudo_p; /* protocol */
u_int16_t ippseudo_len; /* protocol length */
} __packed;
-#endif /* !_NETINET_IP_H_ */
+
+#endif /* !_NETINET_IP_H_ */
