X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/604cd4aa60557f23ee76a60fd8ea339ca2e54e77..refs/heads/master:/extract.h

diff --git a/extract.h b/extract.h
index c355c4d9..5fb48d4f 100644
--- a/extract.h
+++ b/extract.h
@@ -37,7 +37,6 @@
  */
 #include "funcattrs.h"
 #include "netdissect.h"
-#include "diag-control.h"
 
 /*
  * If we have versions of GCC or Clang that support an __attribute__
@@ -149,7 +148,7 @@ EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
  * 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
@@ -261,7 +260,7 @@ EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
  * 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
+ * XXX - ARM is a special case.  ARMv1 through ARMv5 didn't support
  * 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.
@@ -415,7 +414,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
 	             ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 3)) << 8) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 4)) << 0))) : \
-	  ((int64_t)(INT64_T_CONSTANT(0xFFFFFF0000000000U) | \
+	  ((int64_t)(UINT64_C(0xFFFFFF0000000000) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 0)) << 32) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 1)) << 24) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 2)) << 16) | \
@@ -438,7 +437,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
 	              ((uint64_t)(*((const uint8_t *)(p) + 3)) << 16) | \
 	              ((uint64_t)(*((const uint8_t *)(p) + 4)) << 8) | \
 	              ((uint64_t)(*((const uint8_t *)(p) + 5)) << 0))) : \
-	  ((int64_t)(INT64_T_CONSTANT(0xFFFFFFFF00000000U) | \
+	  ((int64_t)(UINT64_C(0xFFFFFFFF00000000) | \
 	              ((uint64_t)(*((const uint8_t *)(p) + 0)) << 40) | \
 	              ((uint64_t)(*((const uint8_t *)(p) + 1)) << 32) | \
 	              ((uint64_t)(*((const uint8_t *)(p) + 2)) << 24) | \
@@ -464,7 +463,7 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
 	             ((uint64_t)(*((const uint8_t *)(p) + 4)) << 16) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 5)) << 8) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 6)) << 0))) : \
-	    ((int64_t)(INT64_T_CONSTANT(0xFFFFFFFFFF000000U) | \
+	    ((int64_t)(UINT64_C(0xFFFFFFFFFF000000) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 0)) << 48) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 1)) << 40) | \
 	             ((uint64_t)(*((const uint8_t *)(p) + 2)) << 32) | \
@@ -576,20 +575,6 @@ EXTRACT_IPV4_TO_NETWORK_ORDER(const void *p)
 #define ND_TTEST_16(p) ND_TTEST_LEN((p), 16)
 #define ND_TCHECK_16(p) ND_TCHECK_LEN((p), 16)
 
-static inline NORETURN void
-nd_trunc_longjmp(netdissect_options *ndo)
-{
-	longjmp(ndo->ndo_early_end, ND_TRUNCATED);
-#ifdef _AIX
-	/*
-	 * In AIX <setjmp.h> decorates longjmp() with "#pragma leaves", which tells
-	 * XL C that the function is noreturn, but GCC remains unaware of that and
-	 * yields a "'noreturn' function does return" warning.
-	 */
-	ND_UNREACHABLE
-#endif /* _AIX */
-}
-
 /* get_u_1 and get_s_1 */
 
 static inline uint8_t
@@ -760,6 +745,36 @@ get_he_s_4(netdissect_options *ndo, const u_char *p)
 	return EXTRACT_HE_S_4(p);
 }
 
+/* get_be_f_N */
+
+static inline float
+get_be_f_4(netdissect_options *ndo, const u_char *p)
+{
+	union { /* int to float conversion buffer */
+		float f;
+		uint32_t i;
+	} buf;
+
+	if (!ND_TTEST_4(p))
+		nd_trunc_longjmp(ndo);
+	buf.i = EXTRACT_BE_U_4(p);
+	return buf.f;
+}
+
+static inline double
+get_be_f_8(netdissect_options *ndo, const u_char *p)
+{
+	union { /* int to float conversion buffer */
+		double f;
+		uint64_t i;
+	} buf;
+
+	if (!ND_TTEST_8(p))
+		nd_trunc_longjmp(ndo);
+	buf.i = EXTRACT_BE_U_8(p);
+	return buf.f;
+}
+
 /* get_le_u_N */
 
 static inline uint16_t
@@ -897,6 +912,9 @@ get_cpy_bytes(netdissect_options *ndo, u_char *dst, const u_char *p, size_t len)
 #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_BE_F_4(p) get_be_f_4(ndo, (const u_char *)(p))
+#define GET_BE_F_8(p) get_be_f_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))