src: add ULOGD_DTYPE_SUM for nfacct-based accounting

This new type will be used in flow-up patch to support XML output.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 89b757a51e2943784cc0c27867f5fa35f8104c0e..88de3ca6fb0e485fb306570c8445968eb4a606ad 100644 (file)
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -80,7 +80,8 @@ enum ulogd_dtype {
        ULOGD_DTYPE_RAW         = 0x0002, /* raw packet data */
        ULOGD_DTYPE_PACKET      = 0x0004, /* packet metadata */
        ULOGD_DTYPE_FLOW        = 0x0008, /* flow metadata */
-       ULOGD_DTYPE_SINK        = 0x0010, /* sink of data, no output keys */
+       ULOGD_DTYPE_SUM         = 0x0010, /* sum metadata */
+       ULOGD_DTYPE_SINK        = 0x0020, /* sink of data, no output keys */
 };
 
 /* structure describing an input  / output parameter of a plugin */

diff --git a/input/sum/ulogd_inpflow_NFACCT.c b/input/sum/ulogd_inpflow_NFACCT.c
index 152cd487fc7f5aae6f178acb85f0ffffd2f9ac01..751c5675864b07e05ef0989d93fb44d54bfc5b69 100644 (file)
--- a/input/sum/ulogd_inpflow_NFACCT.c
+++ b/input/sum/ulogd_inpflow_NFACCT.c
@@ -245,7 +245,7 @@ static struct ulogd_plugin nfacct_plugin = {
        .output = {
                .keys = nfacct_okeys,
                .num_keys = ARRAY_SIZE(nfacct_okeys),
-               .type = ULOGD_DTYPE_FLOW,
+               .type = ULOGD_DTYPE_SUM,
        },
        .config_kset    = &nfacct_kset,
        .interp         = NULL,

diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index 759a0ca14041a7b8391db46f11e4fa4916c7b0a9..6d2a6291c635e3c0cf1969179bea7f0f2b968b9c 100644 (file)
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -248,7 +248,7 @@ static int gprint_fini(struct ulogd_pluginstance *pi)
 static struct ulogd_plugin gprint_plugin = {
        .name = "GPRINT",
        .input = {
-               .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW,
+               .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW | ULOGD_DTYPE_SUM,
        },
        .output = {
                .type = ULOGD_DTYPE_SINK,