X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/38050da48ed59d6a85df524f015fdbff439366c1..refs/heads/master:/extract.h?ds=inline diff --git a/extract.h b/extract.h index c1b486d3..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__ @@ -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) | \ @@ -746,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 @@ -883,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))