[netfilter-cvslog] r7507 - in branches/ulog/ulogd2: . input/packet
kaber at trash.net
kaber at trash.net
Tue Apr 22 07:09:55 CEST 2008
Author: kaber at trash.net
Date: 2008-04-22 07:09:55 +0200 (Tue, 22 Apr 2008)
New Revision: 7507
Modified:
branches/ulog/ulogd2/configure.in
branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
Log:
[ULOGD PATCH, RFC] Modify NFLOG to be able to use it with older libnetfilter_log
NFLOG has been modified to support GID display. There is a problem as this
feature is only available in latest subversion of libnetfilter_log. This
patch made this feature optional:
* It detects if system support the nflog_get_gid() function
* Compilation of nflog_get_gid() related code is conditional
Modified: branches/ulog/ulogd2/configure.in
===================================================================
--- branches/ulog/ulogd2/configure.in 2008-04-21 12:46:04 UTC (rev 7506)
+++ branches/ulog/ulogd2/configure.in 2008-04-22 05:09:55 UTC (rev 7507)
@@ -41,7 +41,11 @@
AC_CHECK_HEADER([libnetfilter_conntrack/libnetfilter_conntrack.h], [AC_MSG_RESULT([found])],
[AC_MSG_ERROR([libnetfilter_conntrack Version 0.0.11 or later needed])])
+AC_CHECK_LIB([netfilter_log], [nflog_get_gid],
+ AC_DEFINE_UNQUOTED([HAVE_NFLOG_GET_GID],[1],[libnetfilter_log has GID support]),,
+ [-lnfnetlink])
+
CT_CHECK_POSTGRES_DB()
AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x")
Modified: branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
===================================================================
--- branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c 2008-04-21 12:46:04 UTC (rev 7506)
+++ branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c 2008-04-22 05:09:55 UTC (rev 7507)
@@ -335,11 +335,12 @@
ret[NFLOG_KEY_OOB_UID].u.value.ui32 = uid;
ret[NFLOG_KEY_OOB_UID].flags |= ULOGD_RETF_VALID;
}
+#ifdef HAVE_NFLOG_GET_GID
if (nflog_get_gid(ldata, &gid) == 0) {
ret[NFLOG_KEY_OOB_GID].u.value.ui32 = gid;
ret[NFLOG_KEY_OOB_GID].flags |= ULOGD_RETF_VALID;
}
-
+#endif
if (nflog_get_seq(ldata, &seq) == 0) {
ret[NFLOG_KEY_OOB_SEQ_LOCAL].u.value.ui32 = seq;
ret[NFLOG_KEY_OOB_SEQ_LOCAL].flags |= ULOGD_RETF_VALID;
More information about the netfilter-cvslog
mailing list