X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7885cfa165458a05ef818c34ee03affc79f03725..refs/pull/1034/head:/extract.h?ds=sidebyside

diff --git a/extract.h b/extract.h
index 84ee97ff..d7d803df 100644
--- a/extract.h
+++ b/extract.h
@@ -37,6 +37,7 @@
  */
 #include "funcattrs.h"
 #include "netdissect.h"
+#include "diag-control.h"
 
 /*
  * If we have versions of GCC or Clang that support an __attribute__
@@ -148,7 +149,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
@@ -581,7 +582,7 @@ static inline uint8_t
 get_u_1(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_1(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_U_1(p);
 }
 
@@ -589,7 +590,7 @@ static inline int8_t
 get_s_1(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_1(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_S_1(p);
 }
 
@@ -599,7 +600,7 @@ static inline uint16_t
 get_be_u_2(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_2(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_2(p);
 }
 
@@ -607,7 +608,7 @@ static inline uint32_t
 get_be_u_3(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_3(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_3(p);
 }
 
@@ -615,7 +616,7 @@ static inline uint32_t
 get_be_u_4(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_4(p);
 }
 
@@ -623,7 +624,7 @@ static inline uint64_t
 get_be_u_5(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_5(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_5(p);
 }
 
@@ -631,7 +632,7 @@ static inline uint64_t
 get_be_u_6(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_6(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_6(p);
 }
 
@@ -639,7 +640,7 @@ static inline uint64_t
 get_be_u_7(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_7(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_7(p);
 }
 
@@ -647,7 +648,7 @@ static inline uint64_t
 get_be_u_8(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_8(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_U_8(p);
 }
 
@@ -657,7 +658,7 @@ static inline int16_t
 get_be_s_2(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_2(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_2(p);
 }
 
@@ -665,7 +666,7 @@ static inline int32_t
 get_be_s_3(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_3(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_3(p);
 }
 
@@ -673,7 +674,7 @@ static inline int32_t
 get_be_s_4(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_4(p);
 }
 
@@ -681,7 +682,7 @@ static inline int64_t
 get_be_s_5(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_5(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_5(p);
 }
 
@@ -689,7 +690,7 @@ static inline int64_t
 get_be_s_6(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_6(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_6(p);
 }
 
@@ -697,7 +698,7 @@ static inline int64_t
 get_be_s_7(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_7(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_7(p);
 }
 
@@ -705,7 +706,7 @@ static inline int64_t
 get_be_s_8(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_8(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_BE_S_8(p);
 }
 
@@ -715,7 +716,7 @@ static inline uint16_t
 get_he_u_2(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_2(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_HE_U_2(p);
 }
 
@@ -723,7 +724,7 @@ static inline uint32_t
 get_he_u_4(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_HE_U_4(p);
 }
 
@@ -733,7 +734,7 @@ static inline int16_t
 get_he_s_2(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_2(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_HE_S_2(p);
 }
 
@@ -741,7 +742,7 @@ static inline int32_t
 get_he_s_4(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_HE_S_4(p);
 }
 
@@ -751,7 +752,7 @@ static inline uint16_t
 get_le_u_2(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_2(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_2(p);
 }
 
@@ -759,7 +760,7 @@ static inline uint32_t
 get_le_u_3(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_3(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_3(p);
 }
 
@@ -767,7 +768,7 @@ static inline uint32_t
 get_le_u_4(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_4(p);
 }
 
@@ -775,7 +776,7 @@ static inline uint64_t
 get_le_u_5(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_5(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_5(p);
 }
 
@@ -783,7 +784,7 @@ static inline uint64_t
 get_le_u_6(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_6(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_6(p);
 }
 
@@ -791,7 +792,7 @@ static inline uint64_t
 get_le_u_7(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_7(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_7(p);
 }
 
@@ -799,7 +800,7 @@ static inline uint64_t
 get_le_u_8(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_8(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_U_8(p);
 }
 
@@ -809,7 +810,7 @@ static inline int16_t
 get_le_s_2(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_2(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_S_2(p);
 }
 
@@ -817,7 +818,7 @@ static inline int32_t
 get_le_s_3(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_3(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_S_3(p);
 }
 
@@ -825,7 +826,7 @@ static inline int32_t
 get_le_s_4(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_S_4(p);
 }
 
@@ -833,7 +834,7 @@ static inline int64_t
 get_le_s_8(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_8(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_LE_S_8(p);
 }
 
@@ -843,7 +844,7 @@ static inline uint32_t
 get_ipv4_to_host_order(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_IPV4_TO_HOST_ORDER(p);
 }
 
@@ -851,7 +852,7 @@ static inline uint32_t
 get_ipv4_to_network_order(netdissect_options *ndo, const u_char *p)
 {
 	if (!ND_TTEST_4(p))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	return EXTRACT_IPV4_TO_NETWORK_ORDER(p);
 }
 
@@ -859,7 +860,7 @@ 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))
-		longjmp(ndo->ndo_truncated, 1);
+		nd_trunc_longjmp(ndo);
 	UNALIGNED_MEMCPY(dst, p, len);
 }