output: GPRINT: fix it with NFLOG

Add ULOGD_DTYPE_RAW to GPRINT to make it work, it does not provide much
information since raw packets come with only a few fields set on.

Therefore, update example ulogd.conf.in file since BASE provides a more
complete packet dissection.

Fixes: 59a71256945d ("src: add example use of GPRINT to ulogd.conf.in configuration file")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index bc7aa3419ed8978e0f64311e973e9f2f4a5cf44b..aedd08e980f7c44e58a56d68822baac8d106ca98 100644 (file)
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -249,7 +249,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 | ULOGD_DTYPE_SUM,
+               .type = ULOGD_DTYPE_RAW | ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW | ULOGD_DTYPE_SUM,
        },
        .output = {
                .type = ULOGD_DTYPE_SINK,

diff --git a/ulogd.conf.in b/ulogd.conf.in
index 99cfc244d2b7639e35ee90694a0c5e7db1f7c28a..9a04bf7c442ac299b09c2fed6f5e6587ef371d73 100644 (file)
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -65,7 +65,7 @@ logfile="/var/log/ulogd.log"
 #stack=log2:NFLOG,base1:BASE,mark1:MARK,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for packet-based logging via GPRINT
-#stack=log1:NFLOG,gp1:GPRINT
+#stack=log1:NFLOG,base1:BASE,gp1:GPRINT
 
 # this is a stack for flow-based logging via LOGEMU
 #stack=ct1:NFCT,ip2str1:IP2STR,print1:PRINTFLOW,emu1:LOGEMU