diff options
| -rw-r--r-- | filter/ulogd_filter_IP2BIN.c | 6 | ||||
| -rw-r--r-- | include/ulogd/ulogd.h | 11 | ||||
| -rw-r--r-- | util/db.c | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c index 7f7bea5..f1ca4ee 100644 --- a/filter/ulogd_filter_IP2BIN.c +++ b/filter/ulogd_filter_IP2BIN.c @@ -28,8 +28,6 @@ #include <ulogd/ulogd.h> #include <netinet/if_ether.h> -#define IPADDR_LENGTH 128 - enum input_keys { KEY_OOB_FAMILY, KEY_OOB_PROTOCOL, @@ -114,7 +112,7 @@ static struct ulogd_key ip2bin_keys[] = { }; -static char ipbin_array[MAX_KEY - START_KEY + 1][IPADDR_LENGTH]; +static char ipbin_array[MAX_KEY - START_KEY + 1][FORMAT_IPV6_BUFSZ]; static int ip2bin(struct ulogd_key *inp, int index, int oindex) { @@ -161,7 +159,7 @@ static int ip2bin(struct ulogd_key *inp, int index, int oindex) return ULOGD_IRET_ERR; } - format_ipv6(ipbin_array[oindex], IPADDR_LENGTH, addr); + format_ipv6(ipbin_array[oindex], sizeof(ipbin_array[oindex]), addr); return ULOGD_IRET_OK; } diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h index 5eafb21..29082df 100644 --- a/include/ulogd/ulogd.h +++ b/include/ulogd/ulogd.h @@ -23,6 +23,15 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +/* + * Minimum size of buffer required to hold an ipv6 address encoded as a + * hex-string, e.g.: + * + * ::1 -> "0x00000000000000000000000000000001" + * 2600:1408:ec00:36::1736:7f28 -> "0x26001408ec0000360000000017367f28" + */ +#define FORMAT_IPV6_BUFSZ (2 + sizeof(struct in6_addr) * 2 + 1) + /* All types with MSB = 1 make use of value.ptr * other types use one of the union's member */ @@ -233,7 +242,7 @@ format_ipv6(char *buf, size_t size, const struct in6_addr *ipv6) { unsigned i = 0; - if (size > 2 + sizeof (*ipv6) * 2) { + if (size >= FORMAT_IPV6_BUFSZ) { buf[i++] = '0'; buf[i++] = 'x'; @@ -370,7 +370,7 @@ static void __format_query_db(struct ulogd_pluginstance *upi, char *start) sprintf(stmt_ins, "%u,", res->u.value.ui32); else { struct in6_addr ipv6; - char addrbuf[2 + sizeof(ipv6) * 2 + 1]; + char addrbuf[FORMAT_IPV6_BUFSZ]; memcpy(ipv6.s6_addr, res->u.value.ui128, sizeof(ipv6.s6_addr)); |