Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / ip6.h

diff --git a/ip6.h b/ip6.h
index f1032ec2920295e1a08505a12ee74bd883ce20e2..1ad914985b62dd11f83692483f50c79aa5c4450e 100644 (file)
--- a/ip6.h
+++ b/ip6.h
@@ -76,12 +76,12 @@
 struct ip6_hdr {
        union {
                struct ip6_hdrctl {
-                       u_int32_t ip6_un1_flow; /* 20 bits of flow-ID */
-                       u_int16_t ip6_un1_plen; /* payload length */
-                       u_int8_t  ip6_un1_nxt;  /* next header */
-                       u_int8_t  ip6_un1_hlim; /* hop limit */
+                       uint32_t ip6_un1_flow;  /* 20 bits of flow-ID */
+                       uint16_t ip6_un1_plen;  /* payload length */
+                       uint8_t  ip6_un1_nxt;   /* next header */
+                       uint8_t  ip6_un1_hlim;  /* hop limit */
                } ip6_un1;
-               u_int8_t ip6_un2_vfc;   /* 4 bits version, top 4 bits class */
+               uint8_t ip6_un2_vfc;    /* 4 bits version, top 4 bits class */
        } ip6_ctlun;
        struct in6_addr ip6_src;        /* source address */
        struct in6_addr ip6_dst;        /* destination address */
@@ -96,8 +96,8 @@ struct ip6_hdr {
 #define ip6_hops       ip6_ctlun.ip6_un1.ip6_un1_hlim
 
 /* in network endian */
-#define IPV6_FLOWINFO_MASK     ((u_int32_t)htonl(0x0fffffff))  /* flow info (28 bits) */
-#define IPV6_FLOWLABEL_MASK    ((u_int32_t)htonl(0x000fffff))  /* flow label (20 bits) */
+#define IPV6_FLOWINFO_MASK     ((uint32_t)htonl(0x0fffffff))   /* flow info (28 bits) */
+#define IPV6_FLOWLABEL_MASK    ((uint32_t)htonl(0x000fffff))   /* flow label (20 bits) */
 #if 1
 /* ECN bits proposed by Sally Floyd */
 #define IP6TOS_CE              0x01    /* congestion experienced */
@@ -109,21 +109,21 @@ struct ip6_hdr {
  */
 
 struct ip6_ext {
-       u_int8_t ip6e_nxt;
-       u_int8_t ip6e_len;
+       uint8_t ip6e_nxt;
+       uint8_t ip6e_len;
 } UNALIGNED;
 
 /* Hop-by-Hop options header */
 struct ip6_hbh {
-       u_int8_t ip6h_nxt;      /* next header */
-       u_int8_t ip6h_len;      /* length in units of 8 octets */
+       uint8_t ip6h_nxt;       /* next header */
+       uint8_t ip6h_len;       /* length in units of 8 octets */
        /* followed by options */
 } UNALIGNED;
 
 /* Destination options header */
 struct ip6_dest {
-       u_int8_t ip6d_nxt;      /* next header */
-       u_int8_t ip6d_len;      /* length in units of 8 octets */
+       uint8_t ip6d_nxt;       /* next header */
+       uint8_t ip6d_len;       /* length in units of 8 octets */
        /* followed by options */
 } UNALIGNED;
 
@@ -165,30 +165,30 @@ struct ip6_dest {
 
 /* Routing header */
 struct ip6_rthdr {
-       u_int8_t  ip6r_nxt;     /* next header */
-       u_int8_t  ip6r_len;     /* length in units of 8 octets */
-       u_int8_t  ip6r_type;    /* routing type */
-       u_int8_t  ip6r_segleft; /* segments left */
+       uint8_t  ip6r_nxt;      /* next header */
+       uint8_t  ip6r_len;      /* length in units of 8 octets */
+       uint8_t  ip6r_type;     /* routing type */
+       uint8_t  ip6r_segleft;  /* segments left */
        /* followed by routing type specific data */
 } UNALIGNED;
 
 /* Type 0 Routing header */
 struct ip6_rthdr0 {
-       u_int8_t  ip6r0_nxt;            /* next header */
-       u_int8_t  ip6r0_len;            /* length in units of 8 octets */
-       u_int8_t  ip6r0_type;           /* always zero */
-       u_int8_t  ip6r0_segleft;        /* segments left */
-       u_int8_t  ip6r0_reserved;       /* reserved field */
-       u_int8_t  ip6r0_slmap[3];       /* strict/loose bit map */
+       uint8_t  ip6r0_nxt;             /* next header */
+       uint8_t  ip6r0_len;             /* length in units of 8 octets */
+       uint8_t  ip6r0_type;            /* always zero */
+       uint8_t  ip6r0_segleft; /* segments left */
+       uint8_t  ip6r0_reserved;        /* reserved field */
+       uint8_t  ip6r0_slmap[3];        /* strict/loose bit map */
        struct in6_addr ip6r0_addr[1];  /* up to 23 addresses */
 } UNALIGNED;
 
 /* Fragment header */
 struct ip6_frag {
-       u_int8_t  ip6f_nxt;             /* next header */
-       u_int8_t  ip6f_reserved;        /* reserved field */
-       u_int16_t ip6f_offlg;           /* offset, reserved, and flag */
-       u_int32_t ip6f_ident;           /* identification */
+       uint8_t  ip6f_nxt;              /* next header */
+       uint8_t  ip6f_reserved; /* reserved field */
+       uint16_t ip6f_offlg;            /* offset, reserved, and flag */
+       uint32_t ip6f_ident;            /* identification */
 } UNALIGNED;
 
 #define IP6F_OFF_MASK          0xfff8  /* mask out offset from ip6f_offlg */
@@ -196,6 +196,6 @@ struct ip6_frag {
 #define IP6F_MORE_FRAG         0x0001  /* more-fragments flag */
 
 /* in print-ip6.c */
-extern int nextproto6_cksum(const struct ip6_hdr *, const u_int8_t *, u_int, u_int, u_int);
+extern int nextproto6_cksum(const struct ip6_hdr *, const uint8_t *, u_int, u_int, u_int);
 
 #endif /* not _NETINET_IP6_H_ */