From 0cc245d4e6ce10624c73d168e2aa5bd267d31776 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Mon, 12 Aug 2019 16:25:40 +0200 Subject: Add GET_IP{6}ADDR_STRING() macros and get_ip{6}addr_string() functions With setjmp/longjmp logic to call the ip{6}addr_string() functions after bounds checking. The macros must be used on a packet buffer pointer. --- addrtoname.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'addrtoname.h') diff --git a/addrtoname.h b/addrtoname.h index 9b78ac06..201ab431 100644 --- a/addrtoname.h +++ b/addrtoname.h @@ -64,6 +64,22 @@ extern const char * ieee8021q_tci_string(const uint16_t); * 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) { @@ -72,4 +88,6 @@ get_le64addr_string(netdissect_options *ndo, const u_char *p) 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)) -- cgit v1.2.1