More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / extract.h

diff --git a/extract.h b/extract.h
index 0d40ed3a19fb1b4e69cbab0a1e4a9dd5b340e19f..2af90d07f3c5cae35f83d8b2649056b072b80eb9 100644 (file)
--- a/extract.h
+++ b/extract.h
@@ -17,12 +17,11 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /tcpdump/master/tcpdump/extract.h,v 1.21 2004-09-24 18:21:25 guy Exp $ (LBL)
  */
 
-/* Network to host order macros */
-
+/*
+ * Macros to extract possibly-unaligned big-endian integral values.
+ */
 #ifdef LBL_ALIGN
 /*
  * The processor doesn't natively handle unaligned loads.
@@ -50,10 +49,26 @@ typedef struct {
        u_int32_t       val;
 } __attribute__((packed)) unaligned_u_int32_t;
 
-#define EXTRACT_16BITS(p) \
-       ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val))
-#define EXTRACT_32BITS(p) \
-       ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+       return ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+       return ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+       return ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 0)->val)) << 32 | \
+               ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)->val)) << 0));
+
+}
+
 #else /* HAVE___ATTRIBUTE__ */
 /*
  * We don't have __attribute__, so do unaligned loads of big-endian
@@ -68,16 +83,41 @@ typedef struct {
                     (u_int32_t)*((const u_int8_t *)(p) + 1) << 16 | \
                     (u_int32_t)*((const u_int8_t *)(p) + 2) << 8 | \
                     (u_int32_t)*((const u_int8_t *)(p) + 3)))
+#define EXTRACT_64BITS(p) \
+       ((u_int64_t)((u_int64_t)*((const u_int8_t *)(p) + 0) << 56 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 1) << 48 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 2) << 40 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 3) << 32 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 4) << 24 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 5) << 16 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 6) << 8 | \
+                    (u_int64_t)*((const u_int8_t *)(p) + 7)))
 #endif /* HAVE___ATTRIBUTE__ */
 #else /* LBL_ALIGN */
 /*
  * The processor natively handles unaligned loads, so we can just
  * cast the pointer and fetch through it.
  */
-#define EXTRACT_16BITS(p) \
-       ((u_int16_t)ntohs(*(const u_int16_t *)(p)))
-#define EXTRACT_32BITS(p) \
-       ((u_int32_t)ntohl(*(const u_int32_t *)(p)))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+       return ((u_int16_t)ntohs(*(const u_int16_t *)(p)));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+       return ((u_int32_t)ntohl(*(const u_int32_t *)(p)));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+       return ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) << 32 | \
+               ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) << 0));
+
+}
+
 #endif /* LBL_ALIGN */
 
 #define EXTRACT_24BITS(p) \
@@ -85,12 +125,10 @@ typedef struct {
                     (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \
                     (u_int32_t)*((const u_int8_t *)(p) + 2)))
 
-#define EXTRACT_64BITS(p) \
-       ((u_int64_t)(u_int64_t)(EXTRACT_32BITS((p) + 0)) << 32 | \
-                   (u_int64_t)(EXTRACT_32BITS((p) + 4)))
-
-/* Little endian protocol host order macros */
-
+/*
+ * Macros to extract possibly-unaligned little-endian integral values.
+ * XXX - do loads on little-endian machines that support unaligned loads?
+ */
 #define EXTRACT_LE_8BITS(p) (*(p))
 #define EXTRACT_LE_16BITS(p) \
        ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 1) << 8 | \
@@ -100,6 +138,10 @@ typedef struct {
                     (u_int32_t)*((const u_int8_t *)(p) + 2) << 16 | \
                     (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \
                     (u_int32_t)*((const u_int8_t *)(p) + 0)))
+#define EXTRACT_LE_24BITS(p) \
+       ((u_int32_t)((u_int32_t)*((const u_int8_t *)(p) + 2) << 16 | \
+                    (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \
+                    (u_int32_t)*((const u_int8_t *)(p) + 0)))
 #define EXTRACT_LE_64BITS(p) \
        ((u_int64_t)((u_int64_t)*((const u_int8_t *)(p) + 7) << 56 | \
                     (u_int64_t)*((const u_int8_t *)(p) + 6) << 48 | \