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

laforge at netfilter.org laforge at netfilter.org
Thu Jan 26 18:34:28 CET 2006


Author: laforge at netfilter.org
Date: 2006-01-26 18:34:27 +0100 (Thu, 26 Jan 2006)
New Revision: 6445

Modified:
   branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h
   branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
Log:
- add IPFIX netfilter vendor specific fields for seq global/local
- use real value for netfilter ipfix vendor id


Modified: branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h
===================================================================
--- branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h	2006-01-26 17:31:57 UTC (rev 6444)
+++ branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h	2006-01-26 17:34:27 UTC (rev 6445)
@@ -5,8 +5,10 @@
  * draft-ietf-ipfix-protocol-19.txt */
 
 #define IPFIX_VENDOR_IETF	0x00000000
-#define IPFIX_VENDOR_NETFILTER	0x23424223
 
+/* defined in http://www.iana.org/assignments/enterprise-numbers */
+#define IPFIX_VENDOR_NETFILTER	21373	/* FIXME: htonl? */
+
 /* Section 3.1 */
 struct ipfix_msg_hdr {
 	u_int16_t	version;
@@ -222,6 +224,8 @@
 	IPFIX_NF_mark			= 4,	/* u_int32_t */
 	IPFIX_NF_hook			= 5,	/* u_int8_t */
 	IPFIX_NF_conntrack_id		= 6,	/* u_int32_t */
+	IPFIX_NF_seq_local		= 7,	/* u_int32_t */
+	IPFIX_NF_seq_global		= 8,	/* u_int32_t */
 };
 
 #endif

Modified: branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c
===================================================================
--- branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c	2006-01-26 17:31:57 UTC (rev 6444)
+++ branches/ulog/ulogd2/input/packet/ulogd_inppkt_NFLOG.c	2006-01-26 17:34:27 UTC (rev 6445)
@@ -198,11 +198,19 @@
 		.type = ULOGD_RET_UINT32,
 		.flags = ULOGD_RETF_NONE,
 		.name = "oob.seq.local",
+		.ipfix = {
+			.vendor = IPFIX_VENDOR_NETFILTER,
+			.field_id = IPFIX_NF_seq_local,
+		},
 	},
 	{
 		.type = ULOGD_RET_UINT32,
 		.flags = ULOGD_RETF_NONE,
 		.name = "oob.seq.global",
+		.ipfix = {
+			.vendor = IPFIX_VENDOR_NETFILTER,
+			.field_id = IPFIX_NF_seq_global,
+		},
 	},
 };
 




More information about the netfilter-cvslog mailing list