[netfilter-cvslog] r6327 - in branches/ulog/ulogd2: include/ulogd
output
laforge at netfilter.org
laforge at netfilter.org
Thu Dec 15 15:07:55 CET 2005
Author: laforge at netfilter.org
Date: 2005-12-15 15:07:53 +0100 (Thu, 15 Dec 2005)
New Revision: 6327
Modified:
branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h
branches/ulog/ulogd2/output/Makefile.am
branches/ulog/ulogd2/output/ulogd_output_IPFIX.c
Log:
make ipfix output plugin compile (not yet functional)
Modified: branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h
===================================================================
--- branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h 2005-12-15 14:07:15 UTC (rev 6326)
+++ branches/ulog/ulogd2/include/ulogd/ipfix_protocol.h 2005-12-15 14:07:53 UTC (rev 6327)
@@ -2,12 +2,12 @@
#define _IPFIX_PROTOCOL_H
/* This header file defines structures for the IPFIX protocol in accordance with
- * draft-ietf-ipfix-protocol-03.txt */
+ * draft-ietf-ipfix-protocol-19.txt */
#define IPFIX_VENDOR_IETF 0x00000000
#define IPFIX_VENDOR_NETFILTER 0x23424223
-/* Section 8.1 */
+/* Section 3.1 */
struct ipfix_msg_hdr {
u_int16_t version;
u_int16_t length;
@@ -16,7 +16,13 @@
u_int32_t source_id;
};
-/* Section 8.2 */
+/* Section 3.4.1 */
+struct ipfix_templ_rec_hdr {
+ u_int16_t templ_id;
+ u_int16_t field_count;
+};
+
+/* Section 3.2 */
struct ipfix_ietf_field {
u_int16_t type;
u_int16_t length;
Modified: branches/ulog/ulogd2/output/Makefile.am
===================================================================
--- branches/ulog/ulogd2/output/Makefile.am 2005-12-15 14:07:15 UTC (rev 6326)
+++ branches/ulog/ulogd2/output/Makefile.am 2005-12-15 14:07:53 UTC (rev 6327)
@@ -4,7 +4,8 @@
INCLUDES = $(all_includes) -I$(top_srcdir)/include
LIBS=
-pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la ulogd_output_OPRINT.la
+pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
+ ulogd_output_OPRINT.la ulogd_output_IPFIX.la
ulogd_output_LOGEMU_la_SOURCES = ulogd_output_LOGEMU.c
ulogd_output_LOGEMU_la_LDFLAGS = -module
@@ -15,4 +16,6 @@
ulogd_output_OPRINT_la_SOURCES = ulogd_output_OPRINT.c
ulogd_output_OPRINT_la_LDFLAGS = -module
+ulogd_output_IPFIX_la_SOURCES = ulogd_output_IPFIX.c
+ulogd_output_IPFIX_la_LDFLAGS = -module
Modified: branches/ulog/ulogd2/output/ulogd_output_IPFIX.c
===================================================================
--- branches/ulog/ulogd2/output/ulogd_output_IPFIX.c 2005-12-15 14:07:15 UTC (rev 6326)
+++ branches/ulog/ulogd2/output/ulogd_output_IPFIX.c 2005-12-15 14:07:53 UTC (rev 6327)
@@ -52,7 +52,7 @@
.key = "port",
.type = CONFIG_TYPE_STRING,
.options = CONFIG_OPT_NONE,
- .u = { .value = IPFIX_DEFAULT_TCPUDP_PORT },
+ .u = { .string = "4739" },
},
{
.key = "protocol",
@@ -82,7 +82,6 @@
char *tmpl_cur;
};
-
/* Build the IPFIX template from the input keys */
static int build_template(struct ulogd_pluginstance *upi)
{
@@ -90,8 +89,8 @@
struct ipfix_templ_rec_hdr *rhdr;
int i, j;
- if (ii->template.buf)
- free(ii->template.buf);
+ if (ii->tmpl)
+ free(ii->tmpl);
ii->tmpl = malloc(sizeof(struct ipfix_template) +
(upi->input.num_keys*sizeof(struct ipfix_vendor_field)));
@@ -101,21 +100,26 @@
#define ULOGD_IPFIX_TEMPL_BASE 1024
/* initialize template header */
- ii->tmpl->hdr.tmpl_id = htons(ULOGD_IPFIX_TEMPL_BASE);
+ ii->tmpl->hdr.templ_id = htons(ULOGD_IPFIX_TEMPL_BASE);
ii->tmpl_cur = ii->tmpl->buf;
for (i = 0; i < upi->input.num_keys; i++) {
- struct ulogd_key *key = ulogd->input.keys[i];
+ struct ulogd_key *key = &upi->input.keys[i];
+ int length = ulogd_key_size(key);
+ if (length < 0 || length > 0xffff)
+ continue;
+
if (key->ipfix.field_id == 0)
continue;
- if (key->ipfix.vendor_id == IPFIX_VENDOR_IETF) {
+
+ if (key->ipfix.vendor == IPFIX_VENDOR_IETF) {
struct ipfix_ietf_field *field =
(struct ipfix_ietf_field *) ii->tmpl_cur;
field->type = htons(key->ipfix.field_id);
- /* FIXME: field->length */
+ field->length = htons(length);
ii->tmpl_cur += sizeof(*field);
} else {
struct ipfix_vendor_field *field =
@@ -123,8 +127,7 @@
field->enterprise_num = htonl(key->ipfix.vendor);
field->type = htons(key->ipfix.field_id);
- /* FIXME: field->length */
-
+ field->length = htons(length);
ii->tmpl_cur += sizeof(*field);
}
j++;
@@ -134,42 +137,18 @@
return 0;
}
-static int _output_ipfix(struct ulogd_pluginstance *upi)
+static int output_ipfix(struct ulogd_pluginstance *upi)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
- struct ulogd_key *res = upi->input;
- static char buf[4096];
+ int i;
- printpkt_print(res, buf, 1);
+ for (i = 0; i < upi->input.num_keys; i++) {
+ struct ulogd_key *key = upi->input.keys[i].u.source;
+ }
- fprintf(li->of, "%s", buf);
-
- if (upi->config_kset->ces[1].u.value)
- fflush(li->of);
-
return 0;
}
-static void signal_handler_ipfix(struct ulogd_pluginstance *pi, int signal)
-{
- struct ipfix_instance *li = (struct ipfix_instance *) &pi->private;
-
- switch (signal) {
- case SIGHUP:
- ulogd_log(ULOGD_NOTICE, "sysipfix: reopening logfile\n");
- fclose(li->of);
- li->of = fopen(pi->config_kset->ces[0].u.string, "a");
- if (!li->of) {
- ulogd_log(ULOGD_ERROR, "can't reopen sysipfix: %s\n",
- strerror(errno));
- }
- break;
- default:
- break;
- }
-}
-
-
static int open_connect_socket(struct ulogd_pluginstance *pi)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &pi->private;
@@ -181,20 +160,20 @@
hint.ai_protocol = ii->sock_proto;
hint.ai_flags = AI_ADDRCONFIG;
- ret = getaddrinfo(host_ce(pi->config_kset).u.value.ptr,
- port_ce(pi->config_kset).u.value.ptr,
+ ret = getaddrinfo(host_ce(pi->config_kset).u.string,
+ port_ce(pi->config_kset).u.string,
&hint, &res);
if (ret != 0) {
ulogd_log(ULOGD_ERROR, "can't resolve host/service: %s\n",
- gaai_strerror(ret));
+ gai_strerror(ret));
return -1;
}
resave = res;
for (; res; res = res->ai_next) {
- li->fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
- if (li->fd < 0) {
+ ii->fd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+ if (ii->fd < 0) {
switch (errno) {
case EACCES:
case EAFNOSUPPORT:
@@ -208,8 +187,8 @@
break;
}
}
- if (connect(li->fd, res->ai_addr, res->ai_addrlen) != 0) {
- close(li->fd);
+ if (connect(ii->fd, res->ai_addr, res->ai_addrlen) != 0) {
+ close(ii->fd);
/* try next result */
continue;
}
@@ -227,6 +206,7 @@
static int start_ipfix(struct ulogd_pluginstance *pi)
{
struct ipfix_instance *li = (struct ipfix_instance *) &pi->private;
+ int ret;
ulogd_log(ULOGD_DEBUG, "starting ipfix\n");
@@ -241,7 +221,7 @@
return 0;
}
-static int fini_ipfix(struct ulogd_pluginstance *pi)
+static int stop_ipfix(struct ulogd_pluginstance *pi)
{
struct ipfix_instance *li = (struct ipfix_instance *) &pi->private;
@@ -250,29 +230,48 @@
return 0;
}
+static void signal_handler_ipfix(struct ulogd_pluginstance *pi, int signal)
+{
+ struct ipfix_instance *li = (struct ipfix_instance *) &pi->private;
+
+ switch (signal) {
+ case SIGHUP:
+ ulogd_log(ULOGD_NOTICE, "ipfix: reopening connection\n");
+ stop_ipfix(pi);
+ start_ipfix(pi);
+ break;
+ default:
+ break;
+ }
+}
+
static int configure_ipfix(struct ulogd_pluginstance *pi,
struct ulogd_pluginstance_stack *stack)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &pi->private;
+ char *proto_str = proto_ce(pi->config_kset).u.string;
+ int ret;
/* FIXME: error handling */
ulogd_log(ULOGD_DEBUG, "parsing config file section %s\n", pi->id);
- config_parse_file(pi->id, pi->config_kset);
+ ret = config_parse_file(pi->id, pi->config_kset);
+ if (ret < 0)
+ return ret;
/* determine underlying protocol */
- if (!strcmp(proto_ce(pi->config_kset), "udp")) {
+ if (!strcasecmp(proto_str, "udp")) {
ii->sock_type = SOCK_DGRAM;
ii->sock_proto = IPPROTO_UDP;
- } else if (!strcmp(proto_ce(pi->config_kset), "tcp")) {
+ } else if (!strcasecmp(proto_str, "tcp")) {
ii->sock_type = SOCK_STREAM;
ii->sock_proto = IPPROTO_TCP;
-#ifdef _HAVE_SCTP
- } else if (!strcmp(proto_ce(pi->config_kset), "sctp")) {
+#ifdef IPPROTO_SCTP
+ } else if (!strcasecmp(proto_str, "sctp")) {
ii->sock_type = SOCK_SEQPACKET;
ii->sock_proto = IPPROTO_SCTP;
#endif
#ifdef _HAVE_DCCP
- } else if (!strcmp(proto_ce(pi->config_kset), "dccp")) {
+ } else if (!strcasecmp(proto_str, "dccp")) {
ii->sock_type = SOCK_SEQPACKET;
ii->sock_proto = IPPROTO_DCCP;
#endif
@@ -285,14 +284,14 @@
/* postpone address lookup to ->start() time, since we want to
* re-lookup an address on SIGHUP */
- return 0;
+ return ulogd_wildcard_inputkeys(pi);
}
static struct ulogd_plugin ipfix_plugin = {
.name = "IPFIX",
.input = {
- .keys = printpkt_keys,
- .num_keys = ARRAY_SIZE(printpkt_keys),
+ .keys = NULL,
+ .num_keys = 0,
.type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW,
},
.output = {
@@ -303,9 +302,9 @@
.configure = &configure_ipfix,
.start = &start_ipfix,
- .stop = &fini_ipfix,
+ .stop = &stop_ipfix,
- .interp = &_output_ipfix,
+ .interp = &output_ipfix,
.signal = &signal_handler_ipfix,
.version = ULOGD_VERSION,
};
More information about the netfilter-cvslog
mailing list