- add IPFIX netfilter vendor specific fields for seq global/local

- use real value for netfilter ipfix vendor id

diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h
index 5cb60867357290db3b5b281c1c05e58e1c5c3d2d..2bf1c3e7d816e27521f3e14a64f30b0ad7beb82f 100644 (file)
--- a/include/ulogd/ipfix_protocol.h
+++ b/include/ulogd/ipfix_protocol.h
@@ -5,7 +5,9 @@
  * 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 {
@@ -222,6 +224,8 @@ enum {
        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

diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index d01bcf8bb9d0aa43b236322501f692f0644d5410..f30925911c72af8c117b02260a37d4b12a2d9243 100644 (file)
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -198,11 +198,19 @@ static struct ulogd_key output_keys[] = {
                .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,
+               },
        },
 };