Made idempotent.

Submitted by:	Paul

21 files changed, 122 insertions, 21 deletions

diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 4353453..151c36c 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: icmp_var.h,v 1.2 1994/08/02 07:47:56 davidg Exp $
  */
 
+#ifndef _NETINET_ICMP_VAR_H_
+#define _NETINET_ICMP_VAR_H_
+
 /*
  * Variables related to this implementation
  * of the internet control message protocol.
@@ -67,3 +70,5 @@ struct	icmpstat {
 #ifdef KERNEL
 struct	icmpstat icmpstat;
 #endif
+
+#endif
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index f971b95..4ad3139 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.h,v 1.2 1994/08/02 07:48:01 davidg Exp $
+ * $Id: if_ether.h,v 1.3 1994/08/18 22:35:27 wollman Exp $
  */
 
+#ifndef _NETINET_IF_ETHER_H_
+#define _NETINET_IF_ETHER_H_
+
 /*
  * Structure of a 10Mb/s Ethernet header.
  */
@@ -222,3 +225,5 @@ struct ether_multistep {
 }
 
 #endif
+
+#endif
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index bb3462d..52c672b 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,9 +35,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: igmp.h,v 1.2 1994/08/02 07:48:07 davidg Exp $
  */
 
+#ifndef _NETINET_IGMP_H_
+#define _NETINET_IGMP_H_
+
 /* Internet Group Management Protocol (IGMP) definitions. */
 
 /*
@@ -58,3 +61,5 @@ struct igmp {
 					   /*  routing protocol            */
 
 #define IGMP_MAX_HOST_REPORT_DELAY   10    /* max delay for response to    */
+
+#endif
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index a0d3809..0018cd2 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,9 +35,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id$
+ * $Id: igmp_var.h,v 1.2 1994/08/02 07:48:09 davidg Exp $
  */
 
+#ifndef _NETINET_IGMP_VAR_H_
+#define _NETINET_IGMP_VAR_H_
+
 /*
  * Internet Group Management Protocol (IGMP),
  * implementation-specific definitions.
@@ -84,3 +87,5 @@ void	igmp_joingroup __P((struct in_multi *));
 void	igmp_leavegroup __P((struct in_multi *));
 void	igmp_fasttimo __P(());
 #endif
+
+#endif
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index e25fb5d..0bf7ed4 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id$
+ * $Id: in.h,v 1.2 1994/08/02 07:48:14 davidg Exp $
  */
 
+#ifndef _NETINET_IN_H_
+#define _NETINET_IN_H_
+
 /*
  * Constants and structures defined by the internet system,
  * Per RFC 790, September 1981, and numerous additions.
@@ -237,3 +240,5 @@ int	 in_localaddr __P((struct in_addr));
 u_long	 in_netof __P((struct in_addr));
 void	 in_socktrim __P((struct sockaddr_in *));
 #endif
+
+#endif
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 5309b37..ff4c71b 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: in_pcb.h,v 1.3 1994/08/02 07:48:20 davidg Exp $
  */
 
+#ifndef _NETINET_IN_PCB_H_
+#define _NETINET_IN_PCB_H_
+
 /*
  * Common structure pcb for internet protocol implementation.
  * Here are stored pointers to local and foreign host table
@@ -87,3 +90,5 @@ void	 in_rtchange __P((struct inpcb *, int));
 void	 in_setpeeraddr __P((struct inpcb *, struct mbuf *));
 void	 in_setsockaddr __P((struct inpcb *, struct mbuf *));
 #endif
+
+#endif
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index d8939a0..f35ab2f 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: in_systm.h,v 1.2 1994/08/02 07:48:25 davidg Exp $
  */
 
+#ifndef _NETINET_IN_SYSTM_H_
+#define _NETINET_IN_SYSTM_H_
+
 /*
  * Miscellaneous internetwork
  * definitions for kernel.
@@ -55,3 +58,5 @@ typedef	u_long	n_time;			/* ms since 00:00 GMT, byte rev */
 #ifdef KERNEL
 n_time	 iptime __P((void));
 #endif
+
+#endif
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index c6ecabb..7683644 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $Id: in_var.h,v 1.3 1994/08/02 07:48:28 davidg Exp $
+ * $Id: in_var.h,v 1.4 1994/08/18 22:35:29 wollman Exp $
  */
 
+#ifndef _NETINET_IN_VAR_H_
+#define _NETINET_IN_VAR_H_
+
 /*
  * Interface address, Internet version.  One of these structures
  * is allocated for each interface with an Internet address.
@@ -196,4 +199,6 @@ struct	in_multi *in_addmulti __P((struct in_addr *, struct ifnet *));
 void	in_delmulti __P((struct in_multi *));
 void	in_ifscrub __P((struct ifnet *, struct in_ifaddr *));
 int	in_control __P((struct socket *, int, caddr_t, struct ifnet *));
+
+#endif
 #endif
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 2542175..1ecb448 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: ip.h,v 1.2 1994/08/02 07:48:30 davidg Exp $
  */
 
+#ifndef _NETINET_IP_H_
+#define _NETINET_IP_H_
+
 /*
  * Definitions for internet protocol version 4.
  * Per RFC 791, September 1981.
@@ -167,3 +170,5 @@ struct	ip_timestamp {
 #define	IPTTLDEC	1		/* subtracted when forwarding */
 
 #define	IP_MSS		576		/* default maximum segment size */
+
+#endif
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 583a049..1a73e0d 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: ip_icmp.h,v 1.2 1994/08/02 07:48:35 davidg Exp $
  */
 
+#ifndef _NETINET_IP_ICMP_H_
+#define _NETINET_IP_ICMP_H_
+
 /*
  * Interface Control Message Protocol Definitions.
  * Per RFC 792, September 1981.
@@ -159,3 +162,5 @@ void	icmp_reflect __P((struct mbuf *));
 void	icmp_send __P((struct mbuf *, struct mbuf *));
 int	icmp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
 #endif
+
+#endif
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index cbedcf5..6f0382a 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,9 +35,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: ip_mroute.h,v 1.2 1994/08/02 07:48:42 davidg Exp $
  */
 
+#ifndef _NETINET_IP_MROUTE_H_
+#define _NETINET_IP_MROUTE_H_
+
 /*
  * Definitions for the kernel part of DVMRP,
  * a Distance-Vector Multicast Routing Protocol.
@@ -172,3 +175,4 @@ int	ip_mrouter_done __P((void));
 
 #endif /* KERNEL */
 
+#endif
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 04ec94d..6c83c4f 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_var.h,v 1.2 1994/08/02 07:48:47 davidg Exp $
+ * $Id: ip_var.h,v 1.3 1994/08/18 22:35:31 wollman Exp $
  */
 
+#ifndef _NETINET_IP_VAR_H_
+#define _NETINET_IP_VAR_H_
+
 /*
  * Overlay for ip header used by other protocols (tcp, udp).
  */
@@ -186,3 +189,5 @@ int	 rip_output __P((struct mbuf *, struct socket *, u_long));
 int	 rip_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *));
 #endif
+
+#endif
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index fc9ae26..03b8e53 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp.h,v 1.2 1994/08/02 07:48:52 davidg Exp $
  */
 
+#ifndef _NETINET_TCP_H_
+#define _NETINET_TCP_H_
+
 typedef	u_long	tcp_seq;
 /*
  * TCP header.
@@ -97,3 +100,5 @@ struct tcphdr {
  */
 #define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
 #define	TCP_MAXSEG	0x02	/* set maximum segment size */
+
+#endif
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 851809f..159b798 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_debug.h,v 1.2 1994/08/02 07:48:56 davidg Exp $
  */
 
+#ifndef _NETINET_TCP_DEBUG_H_
+#define _NETINET_TCP_DEBUG_H_
+
 struct	tcp_debug {
 	n_time	td_time;
 	short	td_act;
@@ -58,3 +61,5 @@ char	*tanames[] =
 #define	TCP_NDEBUG 100
 struct	tcp_debug tcp_debug[TCP_NDEBUG];
 int	tcp_debx;
+
+#endif
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 70518a9..45c7993 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_fsm.h,v 1.2 1994/08/02 07:48:58 davidg Exp $
  */
 
+#ifndef _NETINET_TCP_FSM_H_
+#define _NETINET_TCP_FSM_H_
+
 /*
  * TCP FSM state definitions.
  * Per RFC793, September, 1981.
@@ -84,3 +87,5 @@ char *tcpstates[] = {
 	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
 };
 #endif
+
+#endif
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 7305eb7..d6dc919 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_seq.h,v 1.2 1994/08/02 07:49:06 davidg Exp $
  */
 
+#ifndef _NETINET_TCP_SEQ_H_
+#define _NETINET_TCP_SEQ_H_
 /*
  * TCP sequence numbers are 32 bit integers operated
  * on with modular arithmetic.  These macros can be
@@ -61,3 +63,4 @@
 #ifdef KERNEL
 tcp_seq	tcp_iss;		/* tcp initial send seq # */
 #endif
+#endif
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 19ea6c2..d96ddc4 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_timer.h,v 1.3 1994/08/02 07:49:12 davidg Exp $
  */
 
+#ifndef _NETINET_TCP_TIMER_H_
+#define _NETINET_TCP_TIMER_H_
+
 /*
  * Definitions of the TCP timers.  These timers are counted
  * down PR_SLOWHZ times a second.
@@ -127,3 +130,5 @@ extern int tcp_maxidle;			/* time to drop after starting probes */
 extern int tcp_ttl;			/* time to live for TCP segs */
 extern int tcp_backoff[];
 #endif
+
+#endif
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 1b9730a..7e4192e 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.3 (Berkeley) 4/10/94
- * $Id$
+ * $Id: tcp_var.h,v 1.2 1994/08/02 07:49:17 davidg Exp $
  */
 
+#ifndef _NETINET_TCP_VAR_H_
+#define _NETINET_TCP_VAR_H_
 /*
  * Kernel variables for tcp.
  */
@@ -277,3 +279,5 @@ int	 tcp_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *));
 void	 tcp_xmit_timer __P((struct tcpcb *, int));
 #endif
+
+#endif
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 3059c8e..a8a876c 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcpip.h,v 1.2 1994/08/02 07:49:19 davidg Exp $
  */
 
+#ifndef _NETINET_TCPIP_H_
+#define _NETINET_TCPIP_H_
+
 /*
  * Tcp+ip header, after ip options removed.
  */
@@ -58,3 +61,5 @@ struct tcpiphdr {
 #define	ti_win		ti_t.th_win
 #define	ti_sum		ti_t.th_sum
 #define	ti_urp		ti_t.th_urp
+
+#endif
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 61a5021..d47ea91 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: udp.h,v 1.2 1994/08/02 07:49:22 davidg Exp $
  */
 
+#ifndef _NETINET_UDP_H_
+#define _NETINET_UDP_H_
+
 /*
  * Udp protocol header.
  * Per RFC 768, September, 1981.
@@ -44,3 +47,5 @@ struct udphdr {
 	short	uh_ulen;		/* udp length */
 	u_short	uh_sum;			/* udp checksum */
 };
+
+#endif
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 8060ab0..c047c93 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: udp_var.h,v 1.2 1994/08/02 07:49:26 davidg Exp $
  */
 
+#ifndef _NETINET_UDP_VAR_H_
+#define _NETINET_UDP_VAR_H_
+
 /*
  * UDP kernel structures and variables.
  */
@@ -91,3 +94,5 @@ int	 udp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
 int	 udp_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *));
 #endif
+
+#endif