From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
To: The netfilter developer mailinglist <netfilter-devel@vger.kernel.org>
Subject: [PATCH 5/8] ipfix: add function for ipfix message creation
Date: Sat, 8 Mar 2014 10:13:47 +0900 [thread overview]
Message-ID: <20140308011345.GF4415@gmail.com> (raw)
In-Reply-To: <20140308010344.GA4415@gmail.com>
This function creates ipfix message, template and data part but not scope.
Header sequence is kept by struct ipfix_instance, domain id is specified
by config file. The returned value has no export time so caller set this
and free the value after using it.
---
include/ulogd/ipfix_protocol.h | 8 ++++-
output/ulogd_output_IPFIX.c | 71 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h
index 5d7e46a..266897e 100644
--- a/include/ulogd/ipfix_protocol.h
+++ b/include/ulogd/ipfix_protocol.h
@@ -15,7 +15,13 @@ struct ipfix_msg_hdr {
u_int16_t length;
u_int32_t export_time;
u_int32_t seq;
- u_int32_t source_id;
+ u_int32_t domain_id;
+};
+
+/* Section 3.3.2 */
+struct ipfix_set_hdr {
+ u_int16_t set_id;
+ u_int16_t length;
};
/* Section 3.4.1 */
diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c
index 16cae74..c950fe2 100644
--- a/output/ulogd_output_IPFIX.c
+++ b/output/ulogd_output_IPFIX.c
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
@@ -84,7 +85,7 @@ struct sctp_sndrcvinfo {
#define IPFIX_DEFAULT_TCPUDP_PORT 4739
static struct config_keyset ipfix_kset = {
- .num_ces = 3,
+ .num_ces = 4,
.ces = {
{
.key = "host",
@@ -103,12 +104,19 @@ static struct config_keyset ipfix_kset = {
.options = CONFIG_OPT_NONE,
.u = { .string = "udp" },
},
+ {
+ .key = "domain_id",
+ .type = CONFIG_TYPE_INT,
+ .options = CONFIG_OPT_NONE,
+ .u.value = 0,
+ },
},
};
#define host_ce(x) (x->ces[0])
#define port_ce(x) (x->ces[1])
#define proto_ce(x) (x->ces[2])
+#define domain_ce(x) (x->ces[3])
struct ipfix_template {
struct ipfix_templ_rec_hdr hdr;
@@ -130,6 +138,7 @@ struct ipfix_instance {
struct llist_head template_list;
struct nfct_bitmask *valid_bitmask; /* bitmask of valid keys */
+ u_int32_t seq;
};
#define ULOGD_IPFIX_TEMPL_BASE 1024
@@ -292,6 +301,66 @@ static int put_data_records(struct ulogd_pluginstance *upi,
return len;
}
+static struct ipfix_msg_hdr *build_ipfix_msg(struct ulogd_pluginstance *upi,
+ struct ulogd_ipfix_template *template,
+ bool need_template)
+{
+ struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
+ u_int16_t tmpl_len;
+ struct ipfix_msg_hdr *msg_hdr;
+ struct ipfix_templ_rec_hdr *tmpl_hdr;
+ struct ipfix_set_hdr *data_hdr, *tmpl_set_hdr;
+ void *buf;
+ int msglen, ret;
+
+ msglen = sizeof(struct ipfix_msg_hdr) + sizeof(struct ipfix_set_hdr)
+ + template->data_length;
+ if (need_template)
+ msglen = msglen + sizeof(struct ipfix_set_hdr)
+ + (template->tmpl_cur - (void *)&template->tmpl);
+ buf = malloc(msglen);
+ if (buf == NULL)
+ return NULL;
+ memset(buf, 0, msglen);
+
+ /* ipfix msg header */
+ msg_hdr = buf;
+ msg_hdr->version = htons(10);
+ msg_hdr->length = htons(msglen);
+ msg_hdr->seq = htonl(ii->seq++);
+ msg_hdr->domain_id = htonl(domain_ce(upi->config_kset).u.value);
+ if (need_template) {
+ /* put set header and template records */
+ tmpl_set_hdr = buf + sizeof(*msg_hdr);
+ tmpl_set_hdr->set_id = htons(2);
+ tmpl_len = template->tmpl_cur - (void *)&template->tmpl;
+ tmpl_set_hdr->length = htons(sizeof(*tmpl_set_hdr) + tmpl_len);
+ tmpl_hdr = (void *)tmpl_set_hdr + sizeof(*tmpl_set_hdr);
+ memcpy((void *)tmpl_hdr, (void *)&template->tmpl, tmpl_len);
+ data_hdr = (void *)tmpl_hdr + tmpl_len;
+ } else {
+ data_hdr = buf + sizeof(*msg_hdr);
+ }
+
+ /* put set header and data records */
+ data_hdr->set_id = template->tmpl.hdr.templ_id; /* already ordered */
+ data_hdr->length = htons(sizeof(*data_hdr) + template->data_length);
+ ret = put_data_records(upi, template, (void *)data_hdr + sizeof(*data_hdr));
+ if (ret < 0) {
+ ulogd_log(ULOGD_ERROR, "could not build ipfix dataset");
+ goto free_buf;
+ } else if (ret > msglen) {
+ ulogd_log(ULOGD_ERROR, "overflowed on building ipfix dataset");
+ goto free_buf;
+ }
+
+ return msg_hdr;
+
+free_buf:
+ free(buf);
+ return NULL;
+}
+
static int output_ipfix(struct ulogd_pluginstance *upi)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
--
1.8.5.3
next prev parent reply other threads:[~2014-03-08 1:13 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-08 1:03 [ulogd PATCH 0/8] make progress ulogd_output_IPFIX Ken-ichirou MATSUZAWA
2014-03-08 1:07 ` [PATCH 1/8] ipfix: use nfct_bitmask Ken-ichirou MATSUZAWA
2014-03-23 18:55 ` Eric Leblond
2014-03-08 1:09 ` [PATCH 2/8] ipfix: fix enterprise bit handling Ken-ichirou MATSUZAWA
2014-03-08 1:10 ` [PATCH 3/8] ipfix: some cleanups Ken-ichirou MATSUZAWA
2014-03-08 1:12 ` [PATCH 4/8] ipfix: add functions for ipfix dataset creation Ken-ichirou MATSUZAWA
2014-03-08 1:13 ` Ken-ichirou MATSUZAWA [this message]
2014-03-23 20:06 ` [PATCH 5/8] ipfix: add function for ipfix message creation Eric Leblond
2014-03-08 1:15 ` [PATCH 6/8] ipfix: decide whether prepending template by send times Ken-ichirou MATSUZAWA
2014-03-08 1:17 ` [PATCH 7/8] ipfix: print ipfix message Ken-ichirou MATSUZAWA
2014-03-08 1:19 ` [PATCH 8/8] ipfix: build headers with template Ken-ichirou MATSUZAWA
2014-03-08 1:24 ` [libnetfilter_conntrack PATCH] conntrack: introduce clear and equal functions for bitmask object Ken-ichirou MATSUZAWA
2014-03-08 9:25 ` Florian Westphal
2014-03-23 18:50 ` [ulogd PATCH 0/8] make progress ulogd_output_IPFIX Eric Leblond
2014-03-26 12:11 ` Ken-ichirou MATSUZAWA
2014-03-26 12:16 ` [ulogd PATCH 1/8] ipfix: use nfct_bitmask Ken-ichirou MATSUZAWA
2014-03-26 12:18 ` [ulogd PATCH 2/8] ipfix: fix enterprise bit handling Ken-ichirou MATSUZAWA
2014-03-26 12:19 ` [ulogd PATCH 3/8] ipfix: some cleanups Ken-ichirou MATSUZAWA
2014-03-26 12:23 ` [ulogd PATCH 4/8] ipfix: add functions for ipfix dataset creation Ken-ichirou MATSUZAWA
2014-03-26 12:25 ` [ulogd PATCH 5/8] ipfix: add function for ipfix message creation Ken-ichirou MATSUZAWA
2014-03-26 12:26 ` [ulogd PATCH 6/8] ipfix: decide whether prepending template by send times Ken-ichirou MATSUZAWA
2014-03-26 12:28 ` [ulogd PATCH 7/8] ipfix: print ipfix message Ken-ichirou MATSUZAWA
2014-03-26 12:30 ` [ulogd PATCH 8/8] ipfix: build headers with template Ken-ichirou MATSUZAWA
2014-04-19 13:36 ` [ulogd PATCH 0/8] make progress ulogd_output_IPFIX Eric Leblond
2014-04-22 11:56 ` [ulogd PATCH 1/8 resend] ipfix: use nfct_bitmask Ken-ichirou MATSUZAWA
2014-04-22 12:03 ` [ulogd PATCH 0/8] make progress ulogd_output_IPFIX Ken-ichirou MATSUZAWA
2014-04-22 15:20 ` Eric Leblond
2014-04-28 11:39 ` [ulogd PATCH 0/13] " Ken-ichirou MATSUZAWA
2014-04-28 11:42 ` [libnetfilter_conntrack PATCH 1/13] conntrack: introduce clear and equal functions for bitmask object Ken-ichirou MATSUZAWA
2014-04-28 11:44 ` [ulogd PATCH 2/13] ipfix: use nfct_bitmask Ken-ichirou MATSUZAWA
2014-04-28 11:45 ` [ulogd PATCH 3/13] ipfix: fix enterprise bit handling Ken-ichirou MATSUZAWA
2014-04-28 11:46 ` [ulogd PATCH 4/13] ipfix: some cleanups Ken-ichirou MATSUZAWA
2014-04-28 11:48 ` [ulogd PATCH 5/13] ipfix: add functions for ipfix dataset creation Ken-ichirou MATSUZAWA
2014-04-28 11:49 ` [ulogd PATCH 6/13] ipfix: add function for ipfix message creation Ken-ichirou MATSUZAWA
2014-04-28 11:50 ` [ulogd PATCH 7/13] ipfix: decide whether prepending template by send times Ken-ichirou MATSUZAWA
2014-04-28 11:51 ` [ulogd PATCH 8/13] ipfix: print ipfix message Ken-ichirou MATSUZAWA
2014-04-28 11:52 ` [ulogd PATCH 9/13] ipfix: build headers with template Ken-ichirou MATSUZAWA
2014-04-28 11:53 ` [ulogd PATCH 10/13] nfct: fix ipfix field_id of flow.end.usec Ken-ichirou MATSUZAWA
2014-04-28 11:54 ` [ulogd PATCH 11/13] nfct/ipfix: introduce new vendor id Ken-ichirou MATSUZAWA
2014-04-28 11:56 ` [ulogd PATCH 12/13] nfct: introduce new out keys for ipfix timestamp Ken-ichirou MATSUZAWA
2014-06-01 10:28 ` Eric Leblond
2014-06-02 9:52 ` Pablo Neira Ayuso
2014-06-02 12:51 ` Ken-ichirou MATSUZAWA
2014-06-02 18:59 ` Eric Leblond
2014-04-28 11:57 ` [ulogd PATCH 13/13] ipfix: add debug symbol for yafscii Ken-ichirou MATSUZAWA
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140308011345.GF4415@gmail.com \
--to=chamaken@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).