advance snd_max even when persisting

[unix-history] / 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 63a6e0e..e396bc4 100644 (file)
--- a/usr/src/sys/netinet/ip_icmp.h
+++ b/usr/src/sys/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/* ip_icmp.h 4.2 81/11/18 */
+/* ip_icmp.h 4.5 82/04/25 */

 
 /*
  * Interface Control Message Protocol Definitions.
 
 /*
  * Interface Control Message Protocol Definitions.


@@ -19,11 +19,13 @@ struct icmp {
                        n_short icd_id;
                        n_short icd_seq;
                } 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
        } 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;
        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_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 */
 
 /*
        /* 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_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_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 */