[netfilter-cvslog] r7354 - branches/ulog/ulogd2/input/packet

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-02-09 18:43:32 +0100 (Sat, 09 Feb 2008)
New Revision: 7354

Modified:
   branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
Log:
From: Eric Leblond <eric at inl.fr>
Add support for UID dumping to NFLOG input plugin.


Modified: branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
===================================================================
--- branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c	2008-02-09 17:38:24 UTC (rev 7353)
+++ branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c	2008-02-09 17:43:32 UTC (rev 7354)
@@ -99,6 +99,7 @@
 	NFLOG_KEY_OOB_SEQ_LOCAL,
 	NFLOG_KEY_OOB_SEQ_GLOBAL,
 	NFLOG_KEY_OOB_PROTOCOL,
+	NFLOG_KEY_OOB_UID,
 };
 
 static struct ulogd_key output_keys[] = {
@@ -228,6 +229,12 @@
 		.flags = ULOGD_RETF_NONE,
 		.name = "oob.protocol",
 	},
+	{
+		.type = ULOGD_RET_UINT32,
+		.flags = ULOGD_RETF_NONE,
+		.name = "oob.uid",
+	},
+
 };
 
 static inline int 
@@ -245,6 +252,8 @@
 	u_int32_t indev = nflog_get_indev(ldata);
 	u_int32_t outdev = nflog_get_outdev(ldata);
 	u_int32_t seq;
+	u_int32_t uid;
+	
 
 	if (ph) {
 		/* FIXME */
@@ -302,6 +311,11 @@
 		ret[NFLOG_KEY_OOB_IFINDEX_OUT].flags |= ULOGD_RETF_VALID;
 	}
 
+	if (nflog_get_uid(ldata, &uid) == 0) {
+		ret[NFLOG_KEY_OOB_UID].u.value.ui32 = uid;
+		ret[NFLOG_KEY_OOB_UID].flags |= ULOGD_RETF_VALID;
+	}
+
 	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;