X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/32e24ead3b2a171e5f5eff50d7231c2514eda9b4..a8c33a5850cd9d2f39e56c06b645c283225d78c4:/addrtoname.h

diff --git a/addrtoname.h b/addrtoname.h
index 97b72000..201ab431 100644
--- 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,36 @@ 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_ipaddr_string(netdissect_options *ndo, const u_char *p)
+{
+        if (!ND_TTEST_4(p))
+                longjmp(ndo->ndo_truncated, 1);
+        return ipaddr_string(ndo, p);
+}
+
+static inline const char *
+get_ip6addr_string(netdissect_options *ndo, const u_char *p)
+{
+        if (!ND_TTEST_16(p))
+                longjmp(ndo->ndo_truncated, 1);
+        return ip6addr_string(ndo, p);
+}
+
+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_IPADDR_STRING(p) get_ipaddr_string(ndo, (const u_char *)(p))
+#define GET_IP6ADDR_STRING(p) get_ip6addr_string(ndo, (const u_char *)(p))
+#define GET_LE64ADDR_STRING(p) get_le64addr_string(ndo, (const u_char *)(p))