Add GET_LE64ADDR_STRING() macro and get_le64addr_string() function

With setjmp/longjmp logic to call the le64addr_string() function
after bounds checking.

The macro must be used on a packet buffer pointer.

diff --git a/addrtoname.h b/addrtoname.h
index 97b72000b092a2b5c7e8be09bd2452167a8e93b0..9b78ac06b7bb4aa8b68c38d32fb1d5b5fd1e2abe 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -23,6 +23,9 @@
  * Definitions to let us compile most of the IPv6 code even on systems
  * without IPv6 support.
  */
+
+#include "extract.h"
+
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN       46
 #endif
@@ -55,3 +58,18 @@ extern void init_addrtoname(netdissect_options *, uint32_t, uint32_t);
 extern struct hnamemem *newhnamemem(netdissect_options *);
 extern struct h6namemem *newh6namemem(netdissect_options *);
 extern const char * ieee8021q_tci_string(const uint16_t);
+
+/* macro(s) and inline function(s) with setjmp/longjmp logic to call
+ * the X_string() function(s) after bounds checking.
+ * The macro(s) must be used on a packet buffer pointer.
+ */
+
+static inline const char *
+get_le64addr_string(netdissect_options *ndo, const u_char *p)
+{
+        if (!ND_TTEST_8(p))
+                longjmp(ndo->ndo_truncated, 1);
+        return le64addr_string(ndo, p);
+}
+
+#define GET_LE64ADDR_STRING(p) get_le64addr_string(ndo, (const u_char *)(p))