X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/9fc9afc250eeb034d25f362d2e2bf84872a26d72..e45e68586d8ea982f95285884ecca4ea8e8a0182:/usr/src/sys/netinet/ip_icmp.h

diff --git a/usr/src/sys/netinet/ip_icmp.h b/usr/src/sys/netinet/ip_icmp.h
index 6b177f2b44..e396bc43cc 100644
--- a/usr/src/sys/netinet/ip_icmp.h
+++ b/usr/src/sys/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/* ip_icmp.h 4.1 81/11/08 */
+/* ip_icmp.h 4.5 82/04/25 */
 
 /*
  * Interface Control Message Protocol Definitions.
@@ -14,16 +14,18 @@ struct icmp {
 	u_short	icmp_cksum;		/* ones complement cksum of struct */
 	union {
 		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct ip_addr ih_gwaddr;	/* ICMP_REDIRECT */
+		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
 		struct ih_idseq {
 			n_short	icd_id;
 			n_short	icd_seq;
 		} ih_idseq;
+		int ih_void;
 	} icmp_hun;
 #define	icmp_pptr	icmp_hun.ih_pptr
 #define	icmp_gwaddr	icmp_hun.ih_gwaddr
 #define	icmp_id		icmp_hun.ih_idseq.icd_id
 #define	icmp_seq	icmp_hun.ih_idseq.icd_seq
+#define	icmp_void	icmp_hun.ih_void
 	union {
 		struct id_ts {
 			n_time its_otime;
@@ -52,7 +54,7 @@ struct icmp {
 #define	ICMP_MINLEN	8				/* abs minimum */
 #define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
 #define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_len << 2) + 8)
+#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
 	/* N.B.: must separately check that ip_hl >= 5 */
 
 /*
@@ -76,8 +78,8 @@ struct icmp {
 #define	ICMP_TIMXCEED		11		/* time exceeded, code: */
 #define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
 #define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
+#define	ICMP_PARAMPROB		12		/* ip header bad */
 #define	ICMP_TSTAMP		13		/* timestamp request */
 #define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
 #define	ICMP_IREQ		15		/* information request */
 #define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_PARAMPROB		12		/* ip header bad */