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_OPRINT.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_OPRINT.c')
| -rw-r--r-- | output/ulogd_output_OPRINT.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c index 0409133..b5586e8 100644 --- a/output/ulogd_output_OPRINT.c +++ b/output/ulogd_output_OPRINT.c @@ -24,6 +24,8 @@ #include <string.h> #include <errno.h> #include <inttypes.h> +#include <arpa/inet.h> +#include <netinet/in.h> #include <ulogd/ulogd.h> #include <ulogd/conffile.h> @@ -31,18 +33,6 @@ #define ULOGD_OPRINT_DEFAULT "/var/log/ulogd_oprint.log" #endif -#define NIPQUAD(addr) \ - ((unsigned char *)&addr)[0], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[3] - -#define HIPQUAD(addr) \ - ((unsigned char *)&addr)[3], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[0] - struct oprint_priv { FILE *of; }; @@ -59,7 +49,7 @@ static int oprint_interp(struct ulogd_pluginstance *upi) if (!ret) ulogd_log(ULOGD_NOTICE, "no result for %s ?!?\n", upi->input.keys[i].name); - + if (!IS_VALID(*ret)) continue; @@ -85,10 +75,18 @@ static int oprint_interp(struct ulogd_pluginstance *upi) case ULOGD_RET_UINT64: fprintf(opi->of, "%" PRIu64 "\n", ret->u.value.ui64); break; - case ULOGD_RET_IPADDR: - fprintf(opi->of, "%u.%u.%u.%u\n", - HIPQUAD(ret->u.value.ui32)); + case ULOGD_RET_IPADDR: { + char addrbuf[INET_ADDRSTRLEN + 1] = ""; + struct in_addr ipv4addr; + + ipv4addr.s_addr = ret->u.value.ui32; + if (!inet_ntop(AF_INET, &ipv4addr, addrbuf, + sizeof(addrbuf))) + break; + + fprintf(opi->of, "%s\n", addrbuf); break; + } case ULOGD_RET_NONE: fprintf(opi->of, "<none>\n"); break; |