diff options
| -rw-r--r-- | filter/ulogd_filter_IP2BIN.c | 12 | ||||
| -rw-r--r-- | include/ulogd/ulogd.h | 1 | ||||
| -rw-r--r-- | util/db.c | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c index 9b0110e..33db6a2 100644 --- a/filter/ulogd_filter_IP2BIN.c +++ b/filter/ulogd_filter_IP2BIN.c @@ -82,32 +82,32 @@ static struct ulogd_key ip2bin_inp[] = { static struct ulogd_key ip2bin_keys[] = { { - .type = ULOGD_RET_RAW, + .type = ULOGD_RET_RAWSTR, .flags = ULOGD_RETF_FREE, .name = "ip.saddr.bin", }, { - .type = ULOGD_RET_RAW, + .type = ULOGD_RET_RAWSTR, .flags = ULOGD_RETF_FREE, .name = "ip.daddr.bin", }, { - .type = ULOGD_RET_RAW, + .type = ULOGD_RET_RAWSTR, .flags = ULOGD_RETF_FREE, .name = "orig.ip.saddr.bin", }, { - .type = ULOGD_RET_RAW, + .type = ULOGD_RET_RAWSTR, .flags = ULOGD_RETF_FREE, .name = "orig.ip.daddr.bin", }, { - .type = ULOGD_RET_RAW, + .type = ULOGD_RET_RAWSTR, .flags = ULOGD_RETF_FREE, .name = "reply.ip.saddr.bin", }, { - .type = ULOGD_RET_RAW, + .type = ULOGD_RET_RAWSTR, .flags = ULOGD_RETF_FREE, .name = "reply.ip.daddr.bin", }, diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h index 8c052f2..39ac464 100644 --- a/include/ulogd/ulogd.h +++ b/include/ulogd/ulogd.h @@ -47,6 +47,7 @@ /* types with length field */ #define ULOGD_RET_STRING 0x8020 #define ULOGD_RET_RAW 0x8030 +#define ULOGD_RET_RAWSTR 0x8040 /* FLAGS */ @@ -294,9 +294,12 @@ static int __interp_db(struct ulogd_pluginstance *upi) } sprintf(di->stmt_ins, "',"); break; - case ULOGD_RET_RAW: + case ULOGD_RET_RAWSTR: sprintf(di->stmt_ins, "%s,", res->u.value.ptr); break; + case ULOGD_RET_RAW: + ulogd_log(ULOGD_NOTICE, + "Unsupported RAW type is unsupported in SQL output"); default: ulogd_log(ULOGD_NOTICE, "unknown type %d for %s\n", |