gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / extract.h

diff --git a/extract.h b/extract.h
index 7e2fad1ea8dbe01c5a7cce9e6d540e0f5379ff55..d7d803dfb277ceeb0e95ca485e80a57d4ee7ba52 100644 (file)
--- a/extract.h
+++ b/extract.h
@@ -19,18 +19,25 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+#ifndef EXTRACT_H
+#define EXTRACT_H
+
+#include <string.h>
+

 /*
  * For 8-bit values; needed to fetch a one-byte value.  Byte order
  * isn't relevant, and alignment isn't an issue.
  */
 /*
  * For 8-bit values; needed to fetch a one-byte value.  Byte order
  * isn't relevant, and alignment isn't an issue.
  */

-#define EXTRACT_8BITS(p)       (*(p))
-#define EXTRACT_INT8(p)                ((int8_t)(*(p)))
+#define EXTRACT_U_1(p) ((uint8_t)(*(p)))
+#define EXTRACT_S_1(p) ((int8_t)(*(p)))

 
 /*
  * Inline functions or macros to extract possibly-unaligned big-endian
  * integral values.
  */
 #include "funcattrs.h"
 
 /*
  * Inline functions or macros to extract possibly-unaligned big-endian
  * integral values.
  */
 #include "funcattrs.h"

+#include "netdissect.h"
+#include "diag-control.h"

 
 /*
  * If we have versions of GCC or Clang that support an __attribute__
 
 /*
  * If we have versions of GCC or Clang that support an __attribute__


@@ -63,7 +70,6 @@
 #endif
 
 #if (defined(__i386__) || defined(_M_IX86) || defined(__X86__) || defined(__x86_64__) || defined(_M_X64)) || \
 #endif
 
 #if (defined(__i386__) || defined(_M_IX86) || defined(__X86__) || defined(__x86_64__) || defined(_M_X64)) || \

-    (defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) || \

     (defined(__m68k__) && (!defined(__mc68000__) && !defined(__mc68010__))) || \
     (defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64)) || \
     (defined(__s390__) || defined(__s390x__) || defined(__zarch__))
     (defined(__m68k__) && (!defined(__mc68000__) && !defined(__mc68010__))) || \
     (defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64)) || \
     (defined(__s390__) || defined(__s390x__) || defined(__zarch__))


@@ -72,9 +78,6 @@
  * cast the pointer and fetch through it.
  *
  * XXX - are those all the x86 tests we need?
  * cast the pointer and fetch through it.
  *
  * XXX - are those all the x86 tests we need?

- * XXX - do we need to worry about ARMv1 through ARMv5, which didn't
- * support unaligned loads, and, if so, do we need to worry about all
- * of them, or just some of them, e.g. ARMv5?

  * XXX - are those the only 68k tests we need not to generated
  * unaligned accesses if the target is the 68000 or 68010?
  * XXX - are there any tests we don't need, because some definitions are for
  * XXX - are those the only 68k tests we need not to generated
  * unaligned accesses if the target is the 68000 or 68010?
  * XXX - are there any tests we don't need, because some definitions are for


@@ -82,64 +85,75 @@
  * XXX - do we need to test for both 32-bit and 64-bit versions of those
  * architectures in all cases?
  */
  * XXX - do we need to test for both 32-bit and 64-bit versions of those
  * architectures in all cases?
  */

-static inline uint16_t UNALIGNED_OK
-EXTRACT_BE_16BITS(const void *p)
+UNALIGNED_OK static inline uint16_t
+EXTRACT_BE_U_2(const void *p)

 {
        return ((uint16_t)ntohs(*(const uint16_t *)(p)));
 }
 
 {
        return ((uint16_t)ntohs(*(const uint16_t *)(p)));
 }
 

-static inline int16_t UNALIGNED_OK
-EXTRACT_BE_INT16(const void *p)
+UNALIGNED_OK static inline int16_t
+EXTRACT_BE_S_2(const void *p)

 {
        return ((int16_t)ntohs(*(const int16_t *)(p)));
 }
 
 {
        return ((int16_t)ntohs(*(const int16_t *)(p)));
 }
 

-static inline uint32_t UNALIGNED_OK
-EXTRACT_BE_32BITS(const void *p)
+UNALIGNED_OK static inline uint32_t
+EXTRACT_BE_U_4(const void *p)

 {
        return ((uint32_t)ntohl(*(const uint32_t *)(p)));
 }
 
 {
        return ((uint32_t)ntohl(*(const uint32_t *)(p)));
 }
 

-static inline int32_t UNALIGNED_OK
-EXTRACT_BE_INT32(const void *p)
+UNALIGNED_OK static inline int32_t
+EXTRACT_BE_S_4(const void *p)

 {
        return ((int32_t)ntohl(*(const int32_t *)(p)));
 }
 
 {
        return ((int32_t)ntohl(*(const int32_t *)(p)));
 }
 

-static inline uint64_t UNALIGNED_OK
-EXTRACT_BE_64BITS(const void *p)
+UNALIGNED_OK static inline uint64_t
+EXTRACT_BE_U_8(const void *p)

 {
        return ((uint64_t)(((uint64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
                ((uint64_t)ntohl(*((const uint32_t *)(p) + 1))) << 0));
 
 }
 
 {
        return ((uint64_t)(((uint64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
                ((uint64_t)ntohl(*((const uint32_t *)(p) + 1))) << 0));
 
 }
 

-static inline int64_t UNALIGNED_OK
-EXTRACT_BE_INT64(const void *p)
+UNALIGNED_OK static inline int64_t
+EXTRACT_BE_S_8(const void *p)

 {
        return ((int64_t)(((int64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
                ((uint64_t)ntohl(*((const uint32_t *)(p) + 1))) << 0));
 
 }
 {
        return ((int64_t)(((int64_t)ntohl(*((const uint32_t *)(p) + 0))) << 32 |
                ((uint64_t)ntohl(*((const uint32_t *)(p) + 1))) << 0));
 
 }

-#elif defined(__GNUC__) && defined(HAVE___ATTRIBUTE__) && \
+
+/*
+ * Extract an IPv4 address, which is in network byte order, and not
+ * necessarily aligned, and provide the result in host byte order.
+ */
+UNALIGNED_OK static inline uint32_t
+EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
+{
+       return ((uint32_t)ntohl(*(const uint32_t *)(p)));
+}
+#elif ND_IS_AT_LEAST_GNUC_VERSION(2,0) && \

     (defined(__alpha) || defined(__alpha__) || \
      defined(__mips) || defined(__mips__))
 /*
  * This is MIPS or Alpha, which don't natively handle unaligned loads,
  * but which have instructions that can help when doing unaligned
     (defined(__alpha) || defined(__alpha__) || \
      defined(__mips) || defined(__mips__))
 /*
  * This is MIPS or Alpha, which don't natively handle unaligned loads,
  * but which have instructions that can help when doing unaligned

- * loads, and this is a GCC-compatible compiler and we have __attribute__,
- * which we assume that mean we have __attribute__((packed)), which
- * we can use to convince the compiler to generate those instructions.
+ * loads, and this is GCC 2.0 or later or a compiler that claims to
+ * be GCC 2.0 or later, which we assume that mean we have
+ * __attribute__((packed)), which we can use to convince the compiler
+ * to generate those instructions.

  *
  * Declare packed structures containing a uint16_t and a uint32_t,
  * cast the pointer to point to one of those, and fetch through it;
  * the GCC manual doesn't appear to explicitly say that
  * __attribute__((packed)) causes the compiler to generate unaligned-safe
  *
  * Declare packed structures containing a uint16_t and a uint32_t,
  * cast the pointer to point to one of those, and fetch through it;
  * the GCC manual doesn't appear to explicitly say that
  * __attribute__((packed)) causes the compiler to generate unaligned-safe

- * code, but it apppears to do so.
+ * code, but it appears to do so.

  *
  * We do this in case the compiler can generate code using those
  * instructions to do an unaligned load and pass stuff to "ntohs()" or
  *
  * We do this in case the compiler can generate code using those
  * instructions to do an unaligned load and pass stuff to "ntohs()" or

- * "ntohl()", which might be better than than the code to fetch the
+ * "ntohl()", which might be better than the code to fetch the

  * bytes one at a time and assemble them.  (That might not be the
  * case on a little-endian platform, such as DEC's MIPS machines and
  * Alpha machines, where "ntohs()" and "ntohl()" might not be done
  * bytes one at a time and assemble them.  (That might not be the
  * case on a little-endian platform, such as DEC's MIPS machines and
  * Alpha machines, where "ntohs()" and "ntohl()" might not be done


@@ -192,42 +206,52 @@ typedef struct {
 } __attribute__((packed)) unaligned_int32_t;
 
 UNALIGNED_OK static inline uint16_t
 } __attribute__((packed)) unaligned_int32_t;
 
 UNALIGNED_OK static inline uint16_t

-EXTRACT_BE_16BITS(const void *p)
+EXTRACT_BE_U_2(const void *p)

 {
        return ((uint16_t)ntohs(((const unaligned_uint16_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline int16_t
 {
        return ((uint16_t)ntohs(((const unaligned_uint16_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline int16_t

-EXTRACT_BE_INT16(const void *p)
+EXTRACT_BE_S_2(const void *p)

 {
        return ((int16_t)ntohs(((const unaligned_int16_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline uint32_t
 {
        return ((int16_t)ntohs(((const unaligned_int16_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline uint32_t

-EXTRACT_BE_32BITS(const void *p)
+EXTRACT_BE_U_4(const void *p)

 {
        return ((uint32_t)ntohl(((const unaligned_uint32_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline int32_t
 {
        return ((uint32_t)ntohl(((const unaligned_uint32_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline int32_t

-EXTRACT_BE_INT32(const void *p)
+EXTRACT_BE_S_4(const void *p)

 {
        return ((int32_t)ntohl(((const unaligned_int32_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline uint64_t
 {
        return ((int32_t)ntohl(((const unaligned_int32_t *)(p))->val));
 }
 
 UNALIGNED_OK static inline uint64_t

-EXTRACT_BE_64BITS(const void *p)
+EXTRACT_BE_U_8(const void *p)

 {
        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));
 }
 
 UNALIGNED_OK static inline int64_t
 {
        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));
 }
 
 UNALIGNED_OK static inline int64_t

-EXTRACT_BE_INT64(const void *p)
+EXTRACT_BE_S_8(const void *p)

 {
        return ((int64_t)(((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 0)->val)) << 32 |
                ((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 1)->val)) << 0));
 }
 {
        return ((int64_t)(((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 0)->val)) << 32 |
                ((uint64_t)ntohl(((const unaligned_uint32_t *)(p) + 1)->val)) << 0));
 }

+
+/*
+ * Extract an IPv4 address, which is in network byte order, and not
+ * necessarily aligned, and provide the result in host byte order.
+ */
+UNALIGNED_OK static inline uint32_t
+EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
+{
+       return ((uint32_t)ntohl(((const unaligned_uint32_t *)(p))->val));
+}

 #else
 /*
  * This architecture doesn't natively support unaligned loads, and either
 #else
 /*
  * This architecture doesn't natively support unaligned loads, and either


@@ -236,24 +260,34 @@ EXTRACT_BE_INT64(const void *p)
  * set to do unaligned loads, so do unaligned loads of big-endian
  * quantities the hard way - fetch the bytes one at a time and
  * assemble them.
  * set to do unaligned loads, so do unaligned loads of big-endian
  * quantities the hard way - fetch the bytes one at a time and
  * assemble them.

+ *
+ * XXX - ARM is a special case.  ARMv1 through ARMv5 didn't suppory
+ * unaligned loads; ARMv6 and later support it *but* have a bit in
+ * the system control register that the OS can set and that causes
+ * unaligned loads to fault rather than succeeding.
+ *
+ * At least some OSes may set that flag, so we do *not* treat ARM
+ * as supporting unaligned loads.  If your OS supports them on ARM,
+ * and you want to use them, please update the tests in the #if above
+ * to check for ARM *and* for your OS.

  */
  */

-#define EXTRACT_BE_16BITS(p) \
+#define EXTRACT_BE_U_2(p) \

        ((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
                    ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))
        ((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
                    ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))

-#define EXTRACT_BE_INT16(p) \
+#define EXTRACT_BE_S_2(p) \

        ((int16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
                   ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))
        ((int16_t)(((uint16_t)(*((const uint8_t *)(p) + 0)) << 8) | \
                   ((uint16_t)(*((const uint8_t *)(p) + 1)) << 0)))

-#define EXTRACT_BE_32BITS(p) \
+#define EXTRACT_BE_U_4(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)) << 0)))
        ((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_BE_INT32(p) \
+#define EXTRACT_BE_S_4(p) \

        ((int32_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)))
        ((int32_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_BE_64BITS(p) \
+#define EXTRACT_BE_U_8(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)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 56) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 1)) << 48) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 2)) << 40) | \


@@ -262,7 +296,7 @@ EXTRACT_BE_INT64(const void *p)
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))

-#define EXTRACT_BE_INT64(p) \
+#define EXTRACT_BE_S_8(p) \

        ((int64_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) | \
        ((int64_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) | \


@@ -271,14 +305,93 @@ EXTRACT_BE_INT64(const void *p)
                   ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
                   ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
                   ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))
                   ((uint64_t)(*((const uint8_t *)(p) + 5)) << 16) | \
                   ((uint64_t)(*((const uint8_t *)(p) + 6)) << 8) | \
                   ((uint64_t)(*((const uint8_t *)(p) + 7)) << 0)))

+
+/*
+ * Extract an IPv4 address, which is in network byte order, and not
+ * necessarily aligned, and provide the result in host byte order.
+ */
+#define EXTRACT_IPV4_TO_HOST_ORDER(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)) << 0)))

 #endif /* unaligned access checks */
 
 #endif /* unaligned access checks */
 

-#define EXTRACT_BE_24BITS(p) \
+/*
+ * Extract numerical values in *host* byte order.  (Some metadata
+ * headers are in the byte order of the host that wrote the file,
+ * and libpcap translate them to the byte order of the host
+ * reading the file.  This means that if a program on that host
+ * reads with libpcap and writes to a new file, the new file will
+ * be written in the byte order of the host writing the file.  Thus,
+ * the magic number in pcap files and byte-order magic in pcapng
+ * files can be used to determine the byte order in those metadata
+ * headers.)
+ *
+ * XXX - on platforms that can do unaligned accesses, just cast and
+ * dereference the pointer.
+ */
+static inline uint16_t
+EXTRACT_HE_U_2(const void *p)
+{
+       uint16_t val;
+
+       UNALIGNED_MEMCPY(&val, p, sizeof(uint16_t));
+       return val;
+}
+
+static inline int16_t
+EXTRACT_HE_S_2(const void *p)
+{
+       int16_t val;
+
+       UNALIGNED_MEMCPY(&val, p, sizeof(int16_t));
+       return val;
+}
+
+static inline uint32_t
+EXTRACT_HE_U_4(const void *p)
+{
+       uint32_t val;
+
+       UNALIGNED_MEMCPY(&val, p, sizeof(uint32_t));
+       return val;
+}
+
+static inline int32_t
+EXTRACT_HE_S_4(const void *p)
+{
+       int32_t val;
+
+       UNALIGNED_MEMCPY(&val, p, sizeof(int32_t));
+       return val;
+}
+
+/*
+ * Extract an IPv4 address, which is in network byte order, and which
+ * is not necessarily aligned on a 4-byte boundary, and provide the
+ * result in network byte order.
+ *
+ * This works the same way regardless of the host's byte order.
+ */
+static inline uint32_t
+EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
+{
+       uint32_t addr;
+
+       UNALIGNED_MEMCPY(&addr, p, sizeof(uint32_t));
+       return addr;
+}
+
+/*
+ * Non-power-of-2 sizes.
+ */
+#define EXTRACT_BE_U_3(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)) << 0)))
 
        ((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_BE_INT24(p) \
+#define EXTRACT_BE_S_3(p) \

        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
          ((int32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 16) | \
                     ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
          ((int32_t)(((uint32_t)(*((const uint8_t *)(p) + 0)) << 16) | \
                     ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \


@@ -288,14 +401,14 @@ EXTRACT_BE_INT64(const void *p)
                     ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
                     ((uint32_t)(*((const uint8_t *)(p) + 2)) << 0))))
 
                     ((uint32_t)(*((const uint8_t *)(p) + 1)) << 8) | \
                     ((uint32_t)(*((const uint8_t *)(p) + 2)) << 0))))
 

-#define EXTRACT_BE_40BITS(p) \
+#define EXTRACT_BE_U_5(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)) << 0)))
 
        ((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_BE_INT40(p) \
+#define EXTRACT_BE_S_5(p) \

        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
          ((int64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \
        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
          ((int64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \


@@ -309,7 +422,7 @@ EXTRACT_BE_INT64(const void *p)
                     ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0))))
 
                     ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0))))
 

-#define EXTRACT_BE_48BITS(p) \
+#define EXTRACT_BE_U_6(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)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \


@@ -317,9 +430,9 @@ EXTRACT_BE_INT64(const void *p)
                    ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0)))
 
                    ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0)))
 

-#define EXTRACT_BE_INT48(p) \
+#define EXTRACT_BE_S_6(p) \

        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \

-         ((uint64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
+          ((int64_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) + 1)) << 32) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \


@@ -333,7 +446,7 @@ EXTRACT_BE_INT64(const void *p)
                      ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0))))
 
                      ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
                      ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0))))
 

-#define EXTRACT_BE_56BITS(p) \
+#define EXTRACT_BE_U_7(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)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 2)) << 32) | \


@@ -342,7 +455,7 @@ EXTRACT_BE_INT64(const void *p)
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0)))
 
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0)))
 

-#define EXTRACT_BE_INT56(p) \
+#define EXTRACT_BE_S_7(p) \

        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
          ((int64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
        (((*((const uint8_t *)(p) + 0)) & 0x80) ? \
          ((int64_t)(((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
                     ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \


@@ -364,19 +477,23 @@ EXTRACT_BE_INT64(const void *p)
  * Macros to extract possibly-unaligned little-endian integral values.
  * XXX - do loads on little-endian machines that support unaligned loads?
  */
  * Macros to extract possibly-unaligned little-endian integral values.
  * XXX - do loads on little-endian machines that support unaligned loads?
  */

-#define EXTRACT_LE_16BITS(p) \
+#define EXTRACT_LE_U_2(p) \

        ((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 1)) << 8) | \
                    ((uint16_t)(*((const uint8_t *)(p) + 0)) << 0)))
        ((uint16_t)(((uint16_t)(*((const uint8_t *)(p) + 1)) << 8) | \
                    ((uint16_t)(*((const uint8_t *)(p) + 0)) << 0)))

-#define EXTRACT_LE_32BITS(p) \
+#define EXTRACT_LE_S_2(p) \
+       ((int16_t)(((uint16_t)(*((const uint8_t *)(p) + 1)) << 8) | \
+                  ((uint16_t)(*((const uint8_t *)(p) + 0)) << 0)))
+#define EXTRACT_LE_U_4(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)) << 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)) << 0)))
-#define EXTRACT_LE_64BITS(p) \
+#define EXTRACT_LE_S_4(p) \
+       ((int32_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_U_8(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)(((uint64_t)(*((const uint8_t *)(p) + 7)) << 56) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 6)) << 48) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 5)) << 40) | \


@@ -385,33 +502,409 @@ EXTRACT_BE_INT64(const void *p)
                    ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 1)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 0)) << 0)))
                    ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 1)) << 8) | \
                    ((uint64_t)(*((const uint8_t *)(p) + 0)) << 0)))

+#define EXTRACT_LE_S_8(p) \
+       ((int64_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)))
+
+/*
+ * Non-power-of-2 sizes.
+ */
+
+#define EXTRACT_LE_U_3(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)) << 0)))
+#define EXTRACT_LE_S_3(p) \
+       ((int32_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_U_5(p) \
+       ((uint64_t)(((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)))
+#define EXTRACT_LE_U_6(p) \
+       ((uint64_t)(((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)))
+#define EXTRACT_LE_U_7(p) \
+       ((uint64_t)(((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.
  */
 
 /*
  * Macros to check the presence of the values in question.
  */

-#define ND_TTEST_1(p) ND_TTEST2(*(p), 1)
-#define ND_TCHECK_1(p) ND_TCHECK2(*(p), 1)
+#define ND_TTEST_1(p) ND_TTEST_LEN((p), 1)
+#define ND_TCHECK_1(p) ND_TCHECK_LEN((p), 1)
+
+#define ND_TTEST_2(p) ND_TTEST_LEN((p), 2)
+#define ND_TCHECK_2(p) ND_TCHECK_LEN((p), 2)
+
+#define ND_TTEST_3(p) ND_TTEST_LEN((p), 3)
+#define ND_TCHECK_3(p) ND_TCHECK_LEN((p), 3)
+
+#define ND_TTEST_4(p) ND_TTEST_LEN((p), 4)
+#define ND_TCHECK_4(p) ND_TCHECK_LEN((p), 4)
+
+#define ND_TTEST_5(p) ND_TTEST_LEN((p), 5)
+#define ND_TCHECK_5(p) ND_TCHECK_LEN((p), 5)
+
+#define ND_TTEST_6(p) ND_TTEST_LEN((p), 6)
+#define ND_TCHECK_6(p) ND_TCHECK_LEN((p), 6)
+
+#define ND_TTEST_7(p) ND_TTEST_LEN((p), 7)
+#define ND_TCHECK_7(p) ND_TCHECK_LEN((p), 7)
+
+#define ND_TTEST_8(p) ND_TTEST_LEN((p), 8)
+#define ND_TCHECK_8(p) ND_TCHECK_LEN((p), 8)
+
+#define ND_TTEST_16(p) ND_TTEST_LEN((p), 16)
+#define ND_TCHECK_16(p) ND_TCHECK_LEN((p), 16)
+
+/* get_u_1 and get_s_1 */
+
+static inline uint8_t
+get_u_1(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_1(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_U_1(p);
+}
+
+static inline int8_t
+get_s_1(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_1(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_S_1(p);
+}
+
+/* get_be_u_N */
+
+static inline uint16_t
+get_be_u_2(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_2(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_2(p);
+}
+
+static inline uint32_t
+get_be_u_3(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_3(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_3(p);
+}
+
+static inline uint32_t
+get_be_u_4(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_4(p);
+}
+
+static inline uint64_t
+get_be_u_5(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_5(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_5(p);
+}
+
+static inline uint64_t
+get_be_u_6(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_6(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_6(p);
+}
+
+static inline uint64_t
+get_be_u_7(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_7(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_7(p);
+}
+
+static inline uint64_t
+get_be_u_8(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_8(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_U_8(p);
+}
+
+/* get_be_s_N  */
+
+static inline int16_t
+get_be_s_2(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_2(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_2(p);
+}
+
+static inline int32_t
+get_be_s_3(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_3(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_3(p);
+}
+
+static inline int32_t
+get_be_s_4(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_4(p);
+}
+
+static inline int64_t
+get_be_s_5(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_5(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_5(p);
+}
+
+static inline int64_t
+get_be_s_6(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_6(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_6(p);
+}
+
+static inline int64_t
+get_be_s_7(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_7(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_7(p);
+}
+
+static inline int64_t
+get_be_s_8(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_8(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_BE_S_8(p);
+}
+
+/* get_he_u_N */
+
+static inline uint16_t
+get_he_u_2(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_2(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_HE_U_2(p);
+}
+
+static inline uint32_t
+get_he_u_4(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_HE_U_4(p);
+}

 
 

-#define ND_TTEST_2(p) ND_TTEST2(*(p), 2)
-#define ND_TCHECK_2(p) ND_TCHECK2(*(p), 2)
+/* get_he_s_N */

 
 

-#define ND_TTEST_3(p) ND_TTEST2(*(p), 3)
-#define ND_TCHECK_3(p) ND_TCHECK2(*(p), 3)
+static inline int16_t
+get_he_s_2(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_2(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_HE_S_2(p);
+}
+
+static inline int32_t
+get_he_s_4(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_HE_S_4(p);
+}
+
+/* get_le_u_N */

 
 

-#define ND_TTEST_4(p) ND_TTEST2(*(p), 4)
-#define ND_TCHECK_4(p) ND_TCHECK2(*(p), 4)
+static inline uint16_t
+get_le_u_2(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_2(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_2(p);
+}

 
 

-#define ND_TTEST_5(p) ND_TTEST2(*(p), 5)
-#define ND_TCHECK_5(p) ND_TCHECK2(*(p), 5)
+static inline uint32_t
+get_le_u_3(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_3(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_3(p);
+}

 
 

-#define ND_TTEST_6(p) ND_TTEST2(*(p), 6)
-#define ND_TCHECK_6(p) ND_TCHECK2(*(p), 6)
+static inline uint32_t
+get_le_u_4(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_4(p);
+}

 
 

-#define ND_TTEST_7(p) ND_TTEST2(*(p), 7)
-#define ND_TCHECK_7(p) ND_TCHECK2(*(p), 7)
+static inline uint64_t
+get_le_u_5(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_5(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_5(p);
+}
+
+static inline uint64_t
+get_le_u_6(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_6(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_6(p);
+}
+
+static inline uint64_t
+get_le_u_7(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_7(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_7(p);
+}
+
+static inline uint64_t
+get_le_u_8(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_8(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_U_8(p);
+}

 
 

-#define ND_TTEST_8(p) ND_TTEST2(*(p), 8)
-#define ND_TCHECK_8(p) ND_TCHECK2(*(p), 8)
+/* get_le_s_N */
+
+static inline int16_t
+get_le_s_2(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_2(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_S_2(p);
+}
+
+static inline int32_t
+get_le_s_3(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_3(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_S_3(p);
+}
+
+static inline int32_t
+get_le_s_4(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_S_4(p);
+}
+
+static inline int64_t
+get_le_s_8(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_8(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_LE_S_8(p);
+}
+
+/* get_ipv4_to_{host|network]_order */
+
+static inline uint32_t
+get_ipv4_to_host_order(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_IPV4_TO_HOST_ORDER(p);
+}
+
+static inline uint32_t
+get_ipv4_to_network_order(netdissect_options *ndo, const u_char *p)
+{
+       if (!ND_TTEST_4(p))
+               nd_trunc_longjmp(ndo);
+       return EXTRACT_IPV4_TO_NETWORK_ORDER(p);
+}
+
+static inline void
+get_cpy_bytes(netdissect_options *ndo, u_char *dst, const u_char *p, size_t len)
+{
+       if (!ND_TTEST_LEN(p, len))
+               nd_trunc_longjmp(ndo);
+       UNALIGNED_MEMCPY(dst, p, len);
+}

 
 

-#define ND_TTEST_16(p) ND_TTEST2(*(p), 16)
-#define ND_TCHECK_16(p) ND_TCHECK2(*(p), 16)
+#define GET_U_1(p) get_u_1(ndo, (const u_char *)(p))
+#define GET_S_1(p) get_s_1(ndo, (const u_char *)(p))
+
+#define GET_BE_U_2(p) get_be_u_2(ndo, (const u_char *)(p))
+#define GET_BE_U_3(p) get_be_u_3(ndo, (const u_char *)(p))
+#define GET_BE_U_4(p) get_be_u_4(ndo, (const u_char *)(p))
+#define GET_BE_U_5(p) get_be_u_5(ndo, (const u_char *)(p))
+#define GET_BE_U_6(p) get_be_u_6(ndo, (const u_char *)(p))
+#define GET_BE_U_7(p) get_be_u_7(ndo, (const u_char *)(p))
+#define GET_BE_U_8(p) get_be_u_8(ndo, (const u_char *)(p))
+
+#define GET_BE_S_2(p) get_be_s_2(ndo, (const u_char *)(p))
+#define GET_BE_S_3(p) get_be_s_3(ndo, (const u_char *)(p))
+#define GET_BE_S_4(p) get_be_s_4(ndo, (const u_char *)(p))
+#define GET_BE_S_5(p) get_be_s_5(ndo, (const u_char *)(p))
+#define GET_BE_S_6(p) get_be_s_6(ndo, (const u_char *)(p))
+#define GET_BE_S_7(p) get_be_s_7(ndo, (const u_char *)(p))
+#define GET_BE_S_8(p) get_be_s_8(ndo, (const u_char *)(p))
+
+#define GET_HE_U_2(p) get_he_u_2(ndo, (const u_char *)(p))
+#define GET_HE_U_4(p) get_he_u_4(ndo, (const u_char *)(p))
+
+#define GET_HE_S_2(p) get_he_s_2(ndo, (const u_char *)(p))
+#define GET_HE_S_4(p) get_he_s_4(ndo, (const u_char *)(p))
+
+#define GET_LE_U_2(p) get_le_u_2(ndo, (const u_char *)(p))
+#define GET_LE_U_3(p) get_le_u_3(ndo, (const u_char *)(p))
+#define GET_LE_U_4(p) get_le_u_4(ndo, (const u_char *)(p))
+#define GET_LE_U_5(p) get_le_u_5(ndo, (const u_char *)(p))
+#define GET_LE_U_6(p) get_le_u_6(ndo, (const u_char *)(p))
+#define GET_LE_U_7(p) get_le_u_7(ndo, (const u_char *)(p))
+#define GET_LE_U_8(p) get_le_u_8(ndo, (const u_char *)(p))
+
+#define GET_LE_S_2(p) get_le_s_2(ndo, (const u_char *)(p))
+#define GET_LE_S_3(p) get_le_s_3(ndo, (const u_char *)(p))
+#define GET_LE_S_4(p) get_le_s_4(ndo, (const u_char *)(p))
+#define GET_LE_S_8(p) get_le_s_8(ndo, (const u_char *)(p))
+
+#define GET_IPV4_TO_HOST_ORDER(p) get_ipv4_to_host_order(ndo, (const u_char *)(p))
+#define GET_IPV4_TO_NETWORK_ORDER(p) get_ipv4_to_network_order(ndo, (const u_char *)(p))
+
+#define GET_CPY_BYTES(dst, p, len) get_cpy_bytes(ndo, (u_char *)(dst), (const u_char *)(p), len)
+
+#endif /* EXTRACT_H */