output: add missing support for int64_t values

Some of the output plug-ins don't handle 64-bit signed values.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index aedd08e980f7c44e58a56d68822baac8d106ca98..eeeec6ac3eb066e98a59e6d0d6e1dc045554e39b 100644 (file)
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -127,13 +127,15 @@ static int gprint_interp(struct ulogd_pluginstance *upi)
                case ULOGD_RET_INT8:
                case ULOGD_RET_INT16:
                case ULOGD_RET_INT32:
+               case ULOGD_RET_INT64:
                        ret = snprintf(buf+size, rem, "%s=", key->name);
                        if (ret < 0)
                                break;
                        rem -= ret;
                        size += ret;
 
-                       ret = snprintf(buf+size, rem, "%d,", key->u.value.i32);
+                       ret = snprintf(buf+size, rem, "%" PRId64 ",",
+                                      key->u.value.i64);
                        if (ret < 0)
                                break;
                        rem -= ret;

diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
index 798cb4842719b4de0aa8476e0fbe9631d1529de4..f80d0e2921aacbd14651cd8a372b0d0764ce0d0d 100644 (file)
--- a/output/ulogd_output_JSON.c
+++ b/output/ulogd_output_JSON.c
@@ -364,6 +364,9 @@ static int json_interp(struct ulogd_pluginstance *upi)
                case ULOGD_RET_INT32:
                        json_object_set_new(msg, field_name, json_integer(key->u.value.i32));
                        break;
+               case ULOGD_RET_INT64:
+                       json_object_set_new(msg, field_name, json_integer(key->u.value.i64));
+                       break;
                case ULOGD_RET_UINT8:
                        if ((upi->config_kset->ces[JSON_CONF_BOOLEAN_LABEL].u.value != 0)
                                        && (!strcmp(key->name, "raw.label"))) {