diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2023-08-21 20:42:33 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-09-14 14:22:49 +0200 |
| commit | f04bf6794d1153abd2c3b0bfededd9403d79acf6 (patch) | |
| tree | 36d8765be5719eecb762c89dd3a98e4a1e3abad6 /output/ulogd_output_GPRINT.c | |
| parent | 8084bed5f7f20cb81d588855a72906932538160a (diff) | |
gprint, oprint: use inet_ntop to format ip addresses
Replace hand-rolled ipv4-only formatting code in order to be able to
support ipv6 addresses. This also changes the byte-order expected by
oprint from HBO to NBO.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'output/ulogd_output_GPRINT.c')
| -rw-r--r-- | output/ulogd_output_GPRINT.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c index eeeec6a..093d3ea 100644 --- a/output/ulogd_output_GPRINT.c +++ b/output/ulogd_output_GPRINT.c @@ -27,6 +27,8 @@ #include <time.h> #include <errno.h> #include <inttypes.h> +#include <arpa/inet.h> +#include <netinet/in.h> #include <ulogd/ulogd.h> #include <ulogd/conffile.h> @@ -69,12 +71,6 @@ static struct config_keyset gprint_kset = { }, }; -#define NIPQUAD(addr) \ - ((unsigned char *)&addr)[0], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[3] - static int gprint_interp(struct ulogd_pluginstance *upi) { struct gprint_priv *opi = (struct gprint_priv *) &upi->private; @@ -158,20 +154,24 @@ static int gprint_interp(struct ulogd_pluginstance *upi) rem -= ret; size += ret; break; - case ULOGD_RET_IPADDR: + case ULOGD_RET_IPADDR: { + struct in_addr ipv4addr; + ret = snprintf(buf+size, rem, "%s=", key->name); if (ret < 0) break; rem -= ret; size += ret; - ret = snprintf(buf+size, rem, "%u.%u.%u.%u,", - NIPQUAD(key->u.value.ui32)); - if (ret < 0) + ipv4addr.s_addr = key->u.value.ui32; + if (!inet_ntop(AF_INET, &ipv4addr, buf + size, rem)) break; + ret = strlen(buf + size); + rem -= ret; size += ret; break; + } default: /* don't know how to interpret this key. */ break; |