[ULOGD PATCH 0/3] Misc fixes

[ULOGD PATCH 0/3] Misc fixes

[Eric Leblond]

This patchset contains three patches:
 1. Fix compilation of input plugin when libnetfilter library are non globally available.
 2. Fix warning about undeclared function.
 3. Backport of bugzilla 535: PCAP fix

Patchset statistics:
 input/flow/Makefile.am           |    3 ++-
 input/packet/Makefile.am         |    3 ++-
 input/packet/ulogd_inppkt_ULOG.c |    1 +
 output/pcap/ulogd_output_PCAP.c  |    2 +-
4 files changed, 6 insertions(+), 3 deletions(-)

BR,
--
Eric Leblond
INL: http://www.inl.fr/
NuFW: http://www.nufw.org/

[ULOGD PATCH 1/3] Fix compilation of input plugin when libnetfilter library are non globally available.

[Eric Leblond]

This patch fixes compilation of NFLOG and NFCT plugin when libnetfilter libraries
are installed under a non standard prefix. Include path and libs path for
libnetfilter_conntrack and libnetfilter_log were not correctly set even if
pkg-config found them.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 input/flow/Makefile.am   |    3 ++-
 input/packet/Makefile.am |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/input/flow/Makefile.am b/input/flow/Makefile.am
index 235dc9b..288d335 100644
--- a/input/flow/Makefile.am
+++ b/input/flow/Makefile.am
@@ -5,7 +5,8 @@ AM_CFLAGS=-fPIC -Wall
 pkglib_LTLIBRARIES = ulogd_inpflow_NFCT.la # ulogd_inpflow_IPFIX.la
 
 ulogd_inpflow_NFCT_la_SOURCES = ulogd_inpflow_NFCT.c
-ulogd_inpflow_NFCT_la_LDFLAGS = -module -lnetfilter_conntrack
+ulogd_inpflow_NFCT_la_LDFLAGS = -module $(LIBNETFILTER_CONNTRACK_LIBS)
+ulogd_inpflow_NFCT_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
 
 #ulogd_inpflow_IPFIX_la_SOURCES = ulogd_inpflow_IPFIX.c
 #ulogd_inpflow_IPFIX_la_LDFLAGS = -module
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 1932a20..a07f724 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -6,7 +6,8 @@ LIBS=
 pkglib_LTLIBRARIES = ulogd_inppkt_NFLOG.la ulogd_inppkt_ULOG.la
 
 ulogd_inppkt_NFLOG_la_SOURCES = ulogd_inppkt_NFLOG.c
-ulogd_inppkt_NFLOG_la_LDFLAGS = -module -lnetfilter_log
+ulogd_inppkt_NFLOG_la_LDFLAGS = -module $(LIBNETFILTER_LOG_LIBS)
+ulogd_inppkt_NFLOG_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_LOG_CFLAGS)
 
 ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
 ulogd_inppkt_ULOG_la_LDFLAGS = -module
-- 
1.5.5.3

[ULOGD PATCH 2/3] Fix warning about undeclared function.

[Eric Leblond]

strerror function was used without inclusion of string.h. This patch adds
the include and fixes the warning.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 input/packet/ulogd_inppkt_ULOG.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
index 253bbe0..0b58393 100644
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ b/input/packet/ulogd_inppkt_ULOG.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <arpa/inet.h>
+#include <string.h>
 
 
 #include <ulogd/ulogd.h>
-- 
1.5.5.3

[ULOGD PATCH 3/3] Backport of bugzilla 535

[Eric Leblond]

This patch is a backport of Jaap Keuter fix for PCAP output module.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 output/pcap/ulogd_output_PCAP.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index 0a714e6..ce4393c 100644
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -135,7 +135,7 @@ static int interp_pcap(struct ulogd_pluginstance *upi)
 	struct ulogd_key *res = upi->input.keys;
 	struct pcap_sf_pkthdr pchdr;
 
-	pchdr.caplen = GET_VALUE(res, 1).ui32;
+	pchdr.caplen = GET_VALUE(res, 2).ui32;
 	pchdr.len = GET_VALUE(res, 2).ui32;
 
 	if (GET_FLAGS(res, 3) & ULOGD_RETF_VALID
-- 
1.5.5.3

Re: [ULOGD PATCH 1/3] Fix compilation of input plugin when libnetfilter library are non globally available.

[Pablo Neira Ayuso]

Eric Leblond wrote:
> This patch fixes compilation of NFLOG and NFCT plugin when libnetfilter libraries
> are installed under a non standard prefix. Include path and libs path for
> libnetfilter_conntrack and libnetfilter_log were not correctly set even if
> pkg-config found them.

Applied. Thanks

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [ULOGD PATCH 0/3] Misc fixes

[Pablo Neira Ayuso]

Eric Leblond wrote:
> This patchset contains three patches:
>  1. Fix compilation of input plugin when libnetfilter library are non globally available.
>  2. Fix warning about undeclared function.
>  3. Backport of bugzilla 535: PCAP fix
> 
> Patchset statistics:
>  input/flow/Makefile.am           |    3 ++-
>  input/packet/Makefile.am         |    3 ++-
>  input/packet/ulogd_inppkt_ULOG.c |    1 +
>  output/pcap/ulogd_output_PCAP.c  |    2 +-
> 4 files changed, 6 insertions(+), 3 deletions(-)

All applied. Thanks Eric.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers