Regenerate config files.

[tcpdump] / extract.h

diff --git a/extract.h b/extract.h
index d2174ba2c542a1176008e5ef45e2fc6d3e8b52aa..23623c289cb377be36c35680a45721c1309ac04b 100644 (file)
--- a/extract.h
+++ b/extract.h
@@ -103,7 +103,7 @@ EXTRACT_32BITS(const void *p)
 static inline uint64_t
 EXTRACT_64BITS(const void *p)
 {
-       return ((uint64_t)(((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 0)->val)) << 32 | \
+       return ((uint64_t)(((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 0)->val)) << 32 |
                ((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 1)->val)) << 0));
 }
 
@@ -116,22 +116,22 @@ EXTRACT_64BITS(const void *p)
  * assemble them.
  */
 #define EXTRACT_16BITS(p) \
-       ((uint16_t)((uint16_t)*((const uint8_t *)(p) + 0) << 8 | \
-                    (uint16_t)*((const uint8_t *)(p) + 1)))
+       ((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
+                   ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))
 #define EXTRACT_32BITS(p) \
-       ((uint32_t)((uint32_t)*((const uint8_t *)(p) + 0) << 24 | \
-                    (uint32_t)*((const uint8_t *)(p) + 1) << 16 | \
-                    (uint32_t)*((const uint8_t *)(p) + 2) << 8 | \
-                    (uint32_t)*((const uint8_t *)(p) + 3)))
+       ((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 24) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 1)) << 16) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 2)) << 8) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 3)) << 0)))
 #define EXTRACT_64BITS(p) \
-       ((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 56 | \
-                    (uint64_t)*((const uint8_t *)(p) + 1) << 48 | \
-                    (uint64_t)*((const uint8_t *)(p) + 2) << 40 | \
-                    (uint64_t)*((const uint8_t *)(p) + 3) << 32 | \
-                    (uint64_t)*((const uint8_t *)(p) + 4) << 24 | \
-                    (uint64_t)*((const uint8_t *)(p) + 5) << 16 | \
-                    (uint64_t)*((const uint8_t *)(p) + 6) << 8 | \
-                    (uint64_t)*((const uint8_t *)(p) + 7)))
+       ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 56) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 1)) << 48) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 2)) << 40) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 3)) << 32) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 4)) << 24) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))
 #endif /* must special-case unaligned accesses */
 #else /* LBL_ALIGN */
 /*
@@ -153,7 +153,7 @@ EXTRACT_32BITS(const void *p)
 static inline uint64_t
 EXTRACT_64BITS(const void *p)
 {
-       return ((uint64_t)(((uint64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 | \
+       return ((uint64_t)(((uint64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
                ((uint64_t)ntohl(*((const uint32_t *)(p) + 1))) << 0));
 
 }
@@ -161,33 +161,33 @@ EXTRACT_64BITS(const void *p)
 #endif /* LBL_ALIGN */
 
 #define EXTRACT_24BITS(p) \
-       ((uint32_t)((uint32_t)*((const uint8_t *)(p) + 0) << 16 | \
-                    (uint32_t)*((const uint8_t *)(p) + 1) << 8 | \
-                    (uint32_t)*((const uint8_t *)(p) + 2)))
+       ((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 16) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 2)) << 0)))
 
 #define EXTRACT_40BITS(p) \
-       ((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 32 | \
-                    (uint64_t)*((const uint8_t *)(p) + 1) << 24 | \
-                    (uint64_t)*((const uint8_t *)(p) + 2) << 16 | \
-                    (uint64_t)*((const uint8_t *)(p) + 3) << 8 | \
-                    (uint64_t)*((const uint8_t *)(p) + 4)))
+       ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0)))
 
 #define EXTRACT_48BITS(p) \
-       ((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 40 | \
-                    (uint64_t)*((const uint8_t *)(p) + 1) << 32 | \
-                    (uint64_t)*((const uint8_t *)(p) + 2) << 24 | \
-                    (uint64_t)*((const uint8_t *)(p) + 3) << 16 | \
-                    (uint64_t)*((const uint8_t *)(p) + 4) << 8 | \
-                    (uint64_t)*((const uint8_t *)(p) + 5)))
+       ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0)))
 
 #define EXTRACT_56BITS(p) \
-       ((uint64_t)((uint64_t)*((const uint8_t *)(p) + 0) << 48 | \
-                    (uint64_t)*((const uint8_t *)(p) + 1) << 40 | \
-                    (uint64_t)*((const uint8_t *)(p) + 2) << 32 | \
-                    (uint64_t)*((const uint8_t *)(p) + 3) << 24 | \
-                    (uint64_t)*((const uint8_t *)(p) + 4) << 16 | \
-                    (uint64_t)*((const uint8_t *)(p) + 5) << 8 | \
-                    (uint64_t)*((const uint8_t *)(p) + 6)))
+       ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 2)) << 32) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 3)) << 24) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 4)) << 16) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0)))
 
 /*
  * Macros to extract possibly-unaligned little-endian integral values.
@@ -195,23 +195,50 @@ EXTRACT_64BITS(const void *p)
  */
 #define EXTRACT_LE_8BITS(p) (*(p))
 #define EXTRACT_LE_16BITS(p) \
-       ((uint16_t)((uint16_t)*((const uint8_t *)(p) + 1) << 8 | \
-                    (uint16_t)*((const uint8_t *)(p) + 0)))
+       ((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+                   ((uint16_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_32BITS(p) \
-       ((uint32_t)((uint32_t)*((const uint8_t *)(p) + 3) << 24 | \
-                    (uint32_t)*((const uint8_t *)(p) + 2) << 16 | \
-                    (uint32_t)*((const uint8_t *)(p) + 1) << 8 | \
-                    (uint32_t)*((const uint8_t *)(p) + 0)))
+       ((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 3)) << 24) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_24BITS(p) \
-       ((uint32_t)((uint32_t)*((const uint8_t *)(p) + 2) << 16 | \
-                    (uint32_t)*((const uint8_t *)(p) + 1) << 8 | \
-                    (uint32_t)*((const uint8_t *)(p) + 0)))
+       ((uint32_t)(((uint32_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+                   ((uint32_t)(*((const uint8_t *)(p) + 0)) << 0)))
 #define EXTRACT_LE_64BITS(p) \
-       ((uint64_t)((uint64_t)*((const uint8_t *)(p) + 7) << 56 | \
-                    (uint64_t)*((const uint8_t *)(p) + 6) << 48 | \
-                    (uint64_t)*((const uint8_t *)(p) + 5) << 40 | \
-                    (uint64_t)*((const uint8_t *)(p) + 4) << 32 | \
-                    (uint64_t)*((const uint8_t *)(p) + 3) << 24 | \
-                    (uint64_t)*((const uint8_t *)(p) + 2) << 16 | \
-                    (uint64_t)*((const uint8_t *)(p) + 1) << 8 | \
-                    (uint64_t)*((const uint8_t *)(p) + 0)))
+       ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 7)) << 56) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 6)) << 48) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 5)) << 40) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 4)) << 32) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 3)) << 24) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+                   ((uint64_t)(*((const uint8_t *)(p) + 0)) << 0)))
+
+/*
+ * Macros to check the presence of the values in question.
+ */
+#define ND_TTEST_8BITS(p) ND_TTEST2(*(p), 1)
+#define ND_TCHECK_8BITS(p) ND_TCHECK2(*(p), 1)
+
+#define ND_TTEST_16BITS(p) ND_TTEST2(*(p), 2)
+#define ND_TCHECK_16BITS(p) ND_TCHECK2(*(p), 2)
+
+#define ND_TTEST_24BITS(p) ND_TTEST2(*(p), 3)
+#define ND_TCHECK_24BITS(p) ND_TCHECK2(*(p), 3)
+
+#define ND_TTEST_32BITS(p) ND_TTEST2(*(p), 4)
+#define ND_TCHECK_32BITS(p) ND_TCHECK2(*(p), 4)
+
+#define ND_TTEST_40BITS(p) ND_TTEST2(*(p), 5)
+#define ND_TCHECK_40BITS(p) ND_TCHECK2(*(p), 5)
+
+#define ND_TTEST_48BITS(p) ND_TTEST2(*(p), 6)
+#define ND_TCHECK_48BITS(p) ND_TCHECK2(*(p), 6)
+
+#define ND_TTEST_56BITS(p) ND_TTEST2(*(p), 7)
+#define ND_TCHECK_56BITS(p) ND_TCHECK2(*(p), 7)
+
+#define ND_TTEST_64BITS(p) ND_TTEST2(*(p), 8)
+#define ND_TCHECK_64BITS(p) ND_TCHECK2(*(p), 8)