Add and move declarations to fix all of the warnings from `gcc -Wimplicit'

(except in netccitt, netiso and netns) and most of the warnings from
`gcc -Wnested-externs'.  Fix all the bugs found.  There were no serious
ones.

19 files changed, 47 insertions, 50 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 9517a3c..ceb8ee7 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.11 1995/02/20 15:48:40 davidg Exp $
+ * $Id: if_ether.c,v 1.12 1995/03/16 17:32:26 wollman Exp $
  */
 
 /*
@@ -84,7 +84,6 @@ static	void arptimer __P((void *));
 static	struct llinfo_arp *arplookup __P((u_long, int, int));
 static	void in_arpinput __P((struct mbuf *));
 
-extern	struct ifnet loif;
 struct	llinfo_arp llinfo_arp = {&llinfo_arp, &llinfo_arp};
 struct	ifqueue arpintrq = {0, 0, 0, 50};
 int	arp_inuse, arp_allocated, arp_intimer;
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 9c55d8c..361fe4d 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.6 1994/10/31 06:36:47 pst Exp $
+ * $Id: igmp.c,v 1.7 1995/02/16 00:27:41 wollman Exp $
  */
 
 /*
@@ -67,8 +67,6 @@
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
 
-extern struct ifnet loif;
-
 struct igmpstat igmpstat;
 
 static int igmp_timers_are_running = 0;
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index c36b0fe..495dcff 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.2 (Berkeley) 11/15/93
- * $Id: in.c,v 1.8 1994/12/22 21:56:22 wollman Exp $
+ * $Id: in.c,v 1.9 1995/02/14 06:28:25 phk Exp $
  */
 
 #include <sys/param.h>
@@ -154,7 +154,6 @@ struct sockaddr_in *ap;
 }
 
 int	in_interfaces;		/* number of external internet interfaces */
-extern	struct ifnet loif;
 
 /*
  * Generic internet control operations (ioctl's).
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 25eb0aa..62ea84c 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
- * $Id: in_pcb.c,v 1.6 1995/03/02 19:29:42 davidg Exp $
+ * $Id: in_pcb.c,v 1.7 1995/03/14 21:50:55 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -392,7 +392,6 @@ in_pcbnotify(head, dst, fport_arg, laddr, lport_arg, cmd, notify)
 	int cmd;
 	void (*notify) __P((struct inpcb *, int));
 {
-	extern u_char inetctlerrmap[];
 	register struct inpcb *inp, *oinp;
 	struct in_addr faddr;
 	u_short fport = fport_arg, lport = lport_arg;
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index ff4c71b..9946f12 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: in_pcb.h,v 1.3 1994/08/02 07:48:20 davidg Exp $
+ * $Id: in_pcb.h,v 1.4 1994/08/21 05:27:28 paul Exp $
  */
 
 #ifndef _NETINET_IN_PCB_H_
@@ -81,6 +81,8 @@ int	 in_pcbbind __P((struct inpcb *, struct mbuf *));
 int	 in_pcbconnect __P((struct inpcb *, struct mbuf *));
 void	 in_pcbdetach __P((struct inpcb *));
 void	 in_pcbdisconnect __P((struct inpcb *));
+int	 in_pcbladdr __P((struct inpcb *, struct mbuf *,
+	    struct sockaddr_in **));
 struct inpcb *
 	 in_pcblookup __P((struct inpcb *,
 	    struct in_addr, u_int, struct in_addr, u_int, int));
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index ddf307c..cba0cb4 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $Id: in_var.h,v 1.6 1994/09/06 22:42:20 wollman Exp $
+ * $Id: in_var.h,v 1.7 1994/10/25 22:13:32 swallace Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
@@ -82,6 +82,11 @@ struct	in_aliasreq {
 #ifdef	KERNEL
 extern	struct	in_ifaddr *in_ifaddr;
 extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
+extern	struct	in_addr zeroin_addr;
+extern	u_char	inetctlerrmap[];
+extern	int rtq_reallyold;	/* XXX */
+extern	int rtq_minreallyold;	/* XXX */
+extern	int rtq_toomany;	/* XXX */
 
 /*
  * Macro for finding the interface (ifnet structure) corresponding to one
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index fca9dad..031de2e 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.4 1994/10/08 22:39:56 phk Exp $
+ * $Id: ip_icmp.c,v 1.5 1995/02/16 00:27:43 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -43,6 +43,8 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
+#include <vm/vm.h>
+#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -52,6 +54,7 @@
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#include <netinet/ip_var.h>
 #include <netinet/icmp_var.h>
 
 /*
@@ -185,7 +188,6 @@ icmp_input(m, hlen)
 	struct in_ifaddr *ia;
 	void (*ctlfunc) __P((int, struct sockaddr *, struct ip *));
 	int code;
-	extern u_char ip_protox[];
 
 	/*
 	 * Locate icmp structure in mbuf, and check
@@ -420,7 +422,7 @@ icmp_reflect(m)
 	register struct ip *ip = mtod(m, struct ip *);
 	register struct in_ifaddr *ia;
 	struct in_addr t;
-	struct mbuf *opts = 0, *ip_srcroute();
+	struct mbuf *opts = 0;
 	int optlen = (ip->ip_hl << 2) - sizeof(struct ip);
 
 	if (!in_canforward(ip->ip_src) &&
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 2a2ac733..d65df32 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.16 1995/02/07 20:30:42 gpalmer Exp $
+ * $Id: ip_input.c,v 1.17 1995/02/14 23:04:52 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -44,12 +44,15 @@
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
+#include <vm/vm.h>
+#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
+#include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
@@ -1187,10 +1190,6 @@ ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
 	void *newp;
 	size_t newlen;
 {
-	extern int rtq_reallyold;	/* XXX */
-	extern int rtq_minreallyold; /* XXX */
-	extern int rtq_toomany;	/* XXX */
-
 	/* All sysctl names at this level are terminal. */
 	if (namelen != 1)
 		return (ENOTDIR);
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 40b39da..e8a12a8 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -197,7 +197,6 @@ static int del_mfc(struct delmfcctl *);
 static void cleanup_cache(void *);
 static int ip_mdq(struct mbuf *, struct ifnet *, u_long, struct mfc *,
 		  struct ip_moptions *);
-extern int (*legal_vif_num)(int);
 static void phyint_send(struct ip *, struct vif *, struct mbuf *);
 static void srcrt_send(struct ip *, struct vif *, struct mbuf *);
 static void encap_send(struct ip *, struct vif *, struct mbuf *);
@@ -1873,7 +1872,6 @@ ip_mroute_mod_handle(struct lkm_table *lkmtp, int cmd)
 		static int (*old_mrt_ioctl)();
 		static void (*old_proto4_input)();
 		static int (*old_legal_vif_num)();
-		extern u_char ip_protox[];
 		extern struct protosw inetsw[];
 
 	case LKM_E_LOAD:
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 2d6540e..945c6bd 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_mroute.h,v 1.4 1994/09/06 22:42:23 wollman Exp $
+ * $Id: ip_mroute.h,v 1.5 1994/09/14 03:10:12 wollman Exp $
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
@@ -248,6 +248,7 @@ struct tbf
 
 extern int	(*ip_mrouter_cmd) __P((int, struct socket *, struct mbuf *));
 extern int	(*ip_mrouter_done) __P((void));
+extern int	(*mrt_ioctl) __P((int, caddr_t, struct proc *));
 
 #endif /* KERNEL */
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 5d7537d..1648f36 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- * $Id: ip_output.c,v 1.11 1994/12/13 23:08:12 wollman Exp $
+ * $Id: ip_output.c,v 1.12 1995/01/12 13:06:31 ugen Exp $
  */
 
 #include <sys/param.h>
@@ -172,7 +172,6 @@ ip_output(m0, opt, ro, flags, imo)
 	}
 	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) {
 		struct in_multi *inm;
-		extern struct ifnet loif;
 
 		m->m_flags |= M_MCAST;
 		/*
@@ -811,7 +810,6 @@ ip_setmoptions(optname, imop, m)
 	}
 
 	switch (optname) {
-		extern int (*legal_vif_num)(int);
 	/* store an index number for the vif you wanna use in the send */
 	case IP_MULTICAST_VIF:
 		if (!legal_vif_num) {
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 5ac0e80..a1f0c42 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_var.h,v 1.7 1995/02/14 06:25:17 phk Exp $
+ * $Id: ip_var.h,v 1.8 1995/03/16 16:25:42 wollman Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
@@ -156,8 +156,10 @@ extern struct	ipstat	ipstat;
 extern struct	ipq	ipq;			/* ip reass. queue */
 extern u_short	ip_id;				/* ip packet ctr, for ids */
 extern int	ip_defttl;			/* default IP ttl */
+extern u_char	ip_protox[];
 extern struct socket *ip_rsvpd;	/* reservation protocol daemon */
 extern struct socket *ip_mrouter; /* multicast routing daemon */
+extern int	(*legal_vif_num) __P((int));
 
 int	 ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
 void	 ip_deq __P((struct ipasfrag *));
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index a6bf6fc..bc34836 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.14 1995/02/16 00:55:39 wollman Exp $
+ *	$Id: tcp_input.c,v 1.15 1995/02/16 01:39:19 wollman Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -1881,8 +1881,6 @@ tcp_mss(tp, offer)
 	struct socket *so;
 	struct rmxp_tao *taop;
 	int origoffer = offer;
-	extern int tcp_do_rfc1644;
-	extern int tcp_mssdflt;
 
 	inp = tp->t_inpcb;
 	if ((rt = tcp_rtlookup(inp)) == NULL) {
@@ -2040,7 +2038,6 @@ tcp_mssopt(tp)
 	struct tcpcb *tp;
 {
 	struct rtentry *rt;
-	extern int tcp_mssdflt;
 
 	rt = tcp_rtlookup(tp->t_inpcb);
 	if (rt == NULL)
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index a6bf6fc..bc34836 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.14 1995/02/16 00:55:39 wollman Exp $
+ *	$Id: tcp_input.c,v 1.15 1995/02/16 01:39:19 wollman Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -1881,8 +1881,6 @@ tcp_mss(tp, offer)
 	struct socket *so;
 	struct rmxp_tao *taop;
 	int origoffer = offer;
-	extern int tcp_do_rfc1644;
-	extern int tcp_mssdflt;
 
 	inp = tp->t_inpcb;
 	if ((rt = tcp_rtlookup(inp)) == NULL) {
@@ -2040,7 +2038,6 @@ tcp_mssopt(tp)
 	struct tcpcb *tp;
 {
 	struct rtentry *rt;
-	extern int tcp_mssdflt;
 
 	rt = tcp_rtlookup(tp->t_inpcb);
 	if (rt == NULL)
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 7ba388a..fbbff78 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_subr.c,v 1.7 1995/02/16 00:55:41 wollman Exp $
+ * $Id: tcp_subr.c,v 1.8 1995/03/06 02:49:24 nate Exp $
  */
 
 #include <sys/param.h>
@@ -51,6 +51,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
@@ -427,8 +428,6 @@ tcp_ctlinput(cmd, sa, ip)
 	register struct ip *ip;
 {
 	register struct tcphdr *th;
-	extern struct in_addr zeroin_addr;
-	extern u_char inetctlerrmap[];
 	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
 
 	if (cmd == PRC_QUENCH)
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 7ba388a..fbbff78 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_subr.c,v 1.7 1995/02/16 00:55:41 wollman Exp $
+ * $Id: tcp_subr.c,v 1.8 1995/03/06 02:49:24 nate Exp $
  */
 
 #include <sys/param.h>
@@ -51,6 +51,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
@@ -427,8 +428,6 @@ tcp_ctlinput(cmd, sa, ip)
 	register struct ip *ip;
 {
 	register struct tcphdr *th;
-	extern struct in_addr zeroin_addr;
-	extern u_char inetctlerrmap[];
 	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
 
 	if (cmd == PRC_QUENCH)
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 0b39e82..9a412b5 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.10 1995/02/16 01:42:45 wollman Exp $
+ *	$Id: tcp_usrreq.c,v 1.11 1995/02/17 00:29:42 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -44,6 +44,8 @@
 #include <sys/protosw.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
+#include <vm/vm.h>
+#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -52,6 +54,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
@@ -673,11 +676,6 @@ tcp_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
 	void *newp;
 	size_t newlen;
 {
-	extern	int tcp_do_rfc1323; /* XXX */
-	extern	int tcp_do_rfc1644; /* XXX */
-	extern	int tcp_mssdflt; /* XXX */
-	extern	int tcp_rttdflt; /* XXX */
-
 	/* All sysctl names at this level are terminal. */
 	if (namelen != 1)
 		return (ENOTDIR);
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 460a370..bd4705e 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.3 (Berkeley) 4/10/94
- * $Id: tcp_var.h,v 1.7 1995/02/14 02:35:19 wollman Exp $
+ * $Id: tcp_var.h,v 1.9 1995/02/16 00:55:44 wollman Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
@@ -309,7 +309,11 @@ struct	tcpstat {
 #ifdef KERNEL
 extern	struct inpcb tcb;	/* head of queue of active tcpcb's */
 extern	struct tcpstat tcpstat;	/* tcp statistics */
+extern	int tcp_do_rfc1323;	/* XXX */
+extern	int tcp_do_rfc1644;	/* XXX */
+extern	int tcp_mssdflt;	/* XXX */
 extern	u_long tcp_now;		/* for RFC 1323 timestamps */
+extern	int tcp_rttdflt;	/* XXX */
 
 int	 tcp_attach __P((struct socket *));
 void	 tcp_canceltimers __P((struct tcpcb *));
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 2c6f004..ec7ea3e 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.4 (Berkeley) 1/21/94
- * $Id: udp_usrreq.c,v 1.6 1995/02/16 01:25:06 wollman Exp $
+ * $Id: udp_usrreq.c,v 1.7 1995/02/16 01:47:36 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -43,6 +43,8 @@
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
+#include <vm/vm.h>
+#include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -51,6 +53,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/udp.h>
@@ -364,8 +367,6 @@ udp_ctlinput(cmd, sa, ip)
 	register struct ip *ip;
 {
 	register struct udphdr *uh;
-	extern struct in_addr zeroin_addr;
-	extern u_char inetctlerrmap[];
 
 	if (!PRC_IS_REDIRECT(cmd) &&
 	    ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0))