From 4122928416f0cb32300a756c21ef9bc13311e015 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 2 Jun 2008 01:38:33 +0200 Subject: cleanup for key builder and fix IPv6 support and introduce 128-bits type This patch cleans up the key building by breaking lines at 80 columns and it fixes the IPv6 support (use of a pointer after free) by introducing a new 128 bit type. --- filter/ulogd_filter_IP2BIN.c | 2 +- filter/ulogd_filter_IP2STR.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'filter') diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c index 33db6a2..7412e38 100644 --- a/filter/ulogd_filter_IP2BIN.c +++ b/filter/ulogd_filter_IP2BIN.c @@ -137,7 +137,7 @@ static char *ip2bin(struct ulogd_key* inp, int index, char family) switch (family) { case AF_INET6: - addr = GET_VALUE(inp, index).ptr; + addr = GET_VALUE(inp, index).ui128; break; case AF_INET: /* Convert IPv4 to IPv4 in IPv6 */ diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c index e4ec06d..9ad3b81 100644 --- a/filter/ulogd_filter_IP2STR.c +++ b/filter/ulogd_filter_IP2STR.c @@ -174,7 +174,7 @@ static char *ip2str(struct ulogd_key *inp, int index) switch (convfamily) { case AF_INET6: inet_ntop(AF_INET6, - GET_VALUE(inp, index).ptr, + GET_VALUE(inp, index).ui128, tmp, sizeof(tmp)); break; case AF_INET: -- cgit v1.2.3