[netfilter-cvslog] r7505 - in branches/ulog/ulogd2: include/ulogd input/packet util

[kaber at trash.net]

Author: kaber at trash.net
Date: 2008-04-21 14:40:06 +0200 (Mon, 21 Apr 2008)
New Revision: 7505

Modified:
   branches/ulog/ulogd2/include/ulogd/printpkt.h
   branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
   branches/ulog/ulogd2/util/printpkt.c
Log:
Print GID/MARK in printpkt.c


Modified: branches/ulog/ulogd2/include/ulogd/printpkt.h
===================================================================
--- branches/ulog/ulogd2/include/ulogd/printpkt.h	2008-04-21 12:39:20 UTC (rev 7504)
+++ branches/ulog/ulogd2/include/ulogd/printpkt.h	2008-04-21 12:40:06 UTC (rev 7505)
@@ -8,6 +8,8 @@
 	KEY_OOB_IN,
 	KEY_OOB_OUT,
 	KEY_OOB_UID,
+	KEY_OOB_GID,
+	KEY_OOB_MARK,
 	KEY_RAW_MAC,
 	KEY_RAW_MACLEN,
 	KEY_IP_SADDR,

Modified: branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
===================================================================
--- branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c	2008-04-21 12:39:20 UTC (rev 7504)
+++ branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c	2008-04-21 12:40:06 UTC (rev 7505)
@@ -107,6 +107,7 @@
 	NFLOG_KEY_OOB_FAMILY,
 	NFLOG_KEY_OOB_PROTOCOL,
 	NFLOG_KEY_OOB_UID,
+	NFLOG_KEY_OOB_GID,
 };
 
 static struct ulogd_key output_keys[] = {
@@ -265,7 +266,7 @@
 	u_int32_t outdev = nflog_get_outdev(ldata);
 	u_int32_t seq;
 	u_int32_t uid;
-	
+	u_int32_t gid;
 
 	ret[NFLOG_KEY_OOB_FAMILY].u.value.ui8 = af_ce(upi->config_kset).u.value;
 	ret[NFLOG_KEY_OOB_FAMILY].flags |= ULOGD_RETF_VALID;
@@ -330,6 +331,10 @@
 		ret[NFLOG_KEY_OOB_UID].u.value.ui32 = uid;
 		ret[NFLOG_KEY_OOB_UID].flags |= ULOGD_RETF_VALID;
 	}
+	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;
+	}
 
 	if (nflog_get_seq(ldata, &seq) == 0) {
 		ret[NFLOG_KEY_OOB_SEQ_LOCAL].u.value.ui32 = seq;

Modified: branches/ulog/ulogd2/util/printpkt.c
===================================================================
--- branches/ulog/ulogd2/util/printpkt.c	2008-04-21 12:39:20 UTC (rev 7504)
+++ branches/ulog/ulogd2/util/printpkt.c	2008-04-21 12:40:06 UTC (rev 7505)
@@ -48,6 +48,10 @@
 	[KEY_OOB_UID]		= { .name = "oob.uid",
 				    .flags = ULOGD_KEYF_OPTIONAL
 				  },
+	[KEY_OOB_GID]		= { .name = "oob.gid",
+				    .flags = ULOGD_KEYF_OPTIONAL
+				  },
+	[KEY_OOB_MARK]		= { .name = "oob.mark", },
 	[KEY_RAW_MAC]		= { .name = "raw.mac", },
 	[KEY_RAW_MACLEN]	= { .name = "raw.mac_len", },
 	[KEY_IP_SADDR]		= { .name = "ip.saddr.str", },
@@ -450,8 +454,14 @@
 	}
 
 	if (pp_is_valid(res, KEY_OOB_UID))
-		buf_cur += sprintf(buf_cur, "UID=%d",
+		buf_cur += sprintf(buf_cur, "UID=%u ",
 				   GET_VALUE(res, KEY_OOB_UID).ui32);
+	if (pp_is_valid(res, KEY_OOB_GID))
+		buf_cur += sprintf(buf_cur, "GID=%u ",
+				   GET_VALUE(res, KEY_OOB_GID).ui32);
+	if (pp_is_valid(res, KEY_OOB_MARK))
+		buf_cur += sprintf(buf_cur, "MARK=%x ",
+				   GET_VALUE(res, KEY_OOB_MARK).ui32);
 
 	strcat(buf_cur, "\n");