from libnetfilter_conntrack instead of original
Signed-off-by Ken-ichirou MATSUZAWA <chamas@xxxxxxxxxxxxx>
---
configure.ac | 12 +++++
output/Makefile.am | 10 +++++
output/ulogd_output_IPFIX.c | 107 ++++++--------------------------------------
3 files changed, 35 insertions(+), 94 deletions(-)
diff --git a/configure.ac b/configure.ac
index 522c345..bd46323 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,17 @@ AC_ARG_ENABLE(nfct,
AS_IF([test "x$enable_nfct" = "xyes"], [
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2])
AC_DEFINE([BUILD_NFCT], [1], [Building nfct module])
+
+ AC_MSG_CHECKING([does nfct_bitmask have clear and equal])
+ AC_CACHE_VAL(ac_cv_nfct_bitmask_clear_equal,
+ AC_TRY_COMPILE(
+ [ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>],
+ [ struct nfct_bitmask *b = nrct_bitmask_new(8);
+ nfct_bitmask_clear(b); nfct_bitmask_equal(b, b); ],
+ ac_cv_nfct_bitmask_clear_equal=yes,
+ ac_cv_nfct_bitmask_clear_equal=no))
+ AC_MSG_RESULT($ac_cv_nfct_bitmask_clear_equal)
+ AM_CONDITIONAL([BUILD_IPFIX], [test "x$ac_cv_nfct_bitmask_clear_equal" = "xyes"])
])
AM_CONDITIONAL([BUILD_NFCT], [test "x$enable_nfct" = "xyes"])
AC_ARG_ENABLE(nfacct,
@@ -164,5 +175,6 @@ Ulogd configuration:
SQLITE3 plugin: ${enable_sqlite3}
DBI plugin: ${enable_dbi}
JSON plugin: ${enable_jansson}
+ IPFIX plugin: ${ac_cv_nfct_bitmask_clear_equal}
"
echo "You can now run 'make' and 'make install'"
diff --git a/output/Makefile.am b/output/Makefile.am
index ff851ad..0cb4a20 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -13,6 +13,10 @@ if HAVE_JANSSON
pkglib_LTLIBRARIES += ulogd_output_JSON.la
endif
+if BUILD_IPFIX
+pkglib_LTLIBRARIES += ulogd_output_IPFIX.la
+endif
+
ulogd_output_GPRINT_la_SOURCES = ulogd_output_GPRINT.c
ulogd_output_GPRINT_la_LDFLAGS = -avoid-version -module
@@ -42,3 +46,9 @@ ulogd_output_JSON_la_SOURCES = ulogd_output_JSON.c
ulogd_output_JSON_la_LIBADD = ${libjansson_LIBS}
ulogd_output_JSON_la_LDFLAGS = -avoid-version -module
endif
+
+if BUILD_IPFIX
+ulogd_output_IPFIX_la_SOURCES = ulogd_output_IPFIX.c
+ulogd_output_IPFIX_la_LDFLAGS = -avoid-version -module
+ulogd_output_IPFIX_la_LIBADD = ${LIBNETFILTER_CONNTRACK_LIBS}
+endif
diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c
index 761d272..01ac9a0 100644
--- a/output/ulogd_output_IPFIX.c
+++ b/output/ulogd_output_IPFIX.c
@@ -36,6 +36,8 @@
#include <sys/socket.h>
#include <netdb.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+
#include <ulogd/linuxlist.h>
#ifdef IPPROTO_SCTP
@@ -68,89 +70,6 @@ struct sctp_sndrcvinfo {
#define IPFIX_DEFAULT_TCPUDP_PORT 4739
-/* bitmask stuff */
-struct bitmask {
- int size_bits;
- char *buf;
-};
-
-#define SIZE_OCTETS(x) ((x/8)+1)
-
-void bitmask_clear(struct bitmask *bm)
-{
- memset(bm->buf, 0, SIZE_OCTETS(bm->size_bits));
-}
-
-struct bitmask *bitmask_alloc(unsigned int num_bits)
-{
- struct bitmask *bm;
- unsigned int size_octets = SIZE_OCTETS(num_bits);
-
- bm = malloc(sizeof(*bm) + size_octets);
- if (!bm)
- return NULL;
-
- bm->size_bits = num_bits;
- bm->buf = (void *)bm + sizeof(*bm);
-
- bitmask_clear(bm);
-
- return bm;
-}
-
-void bitmask_free(struct bitmask *bm)
-{
- free(bm);
-}
-
-int bitmask_set_bit_to(struct bitmask *bm, unsigned int bits, int to)
-{
- unsigned int byte = bits / 8;
- unsigned int bit = bits % 8;
- unsigned char *ptr;
-
- if (byte > SIZE_OCTETS(bm->size_bits))
- return -EINVAL;
-
- if (to == 0)
- bm->buf[byte] &= ~(1 << bit);
- else
- bm->buf[byte] |= (1 << bit);
-
- return 0;
-}
-
-#define bitmask_clear_bit(bm, bit) \
- bitmask_set_bit_to(bm, bit, 0)
-
-#define bitmask_set_bit(bm, bit) \
- bitmask_set_bit_to(bm, bit, 1)
-
-int bitmasks_equal(const struct bitmask *bm1, const struct bitmask *bm2)
-{
- if (bm1->size_bits != bm2->size_bits)
- return -1;
-
- if (!memcmp(bm1->buf, bm2->buf, SIZE_OCTETS(bm1->size_bits)))
- return 1;
- else
- return 0;
-}
-
-struct bitmask *bitmask_dup(const struct bitmask *bm_orig)
-{
- struct bitmask *bm_new;
- int size = sizeof(*bm_new) + SIZE_OCTETS(bm_orig->size_bits);
-
- bm_new = malloc(size);
- if (!bm_new)
- return NULL;
-
- memcpy(bm_new, bm_orig, size);
-
- return bm_new;
-}
-
static struct config_keyset ipfix_kset = {
.num_ces = 3,
.ces = {
@@ -185,7 +104,7 @@ struct ipfix_template {
struct ulogd_ipfix_template {
struct llist_head list;
- struct bitmask *bitmask;
+ struct nfct_bitmask *bitmask;
unsigned int total_length; /* length of the DATA */
char *tmpl_cur; /* cursor into current template position */
struct ipfix_template tmpl;
@@ -201,7 +120,7 @@ struct ipfix_instance {
struct ipfix_template *tmpl;
unsigned int tmpl_len;
- struct bitmask *valid_bitmask; /* bitmask of valid keys */
+ struct nfct_bitmask *valid_bitmask; /* bitmask of valid keys */
unsigned int total_length; /* total size of all data elements */
};
@@ -212,7 +131,7 @@ static u_int16_t next_template_id = ULOGD_IPFIX_TEMPL_BASE;
/* Build the IPFIX template from the input keys */
struct ulogd_ipfix_template *
build_template_for_bitmask(struct ulogd_pluginstance *upi,
- struct bitmask *bm)
+ struct nfct_bitmask *bm)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
struct ipfix_templ_rec_hdr *rhdr;
@@ -226,7 +145,7 @@ build_template_for_bitmask(struct ulogd_pluginstance *upi,
return NULL;
memset(tmpl, 0, size);
- tmpl->bitmask = bitmask_dup(bm);
+ tmpl->bitmask = nfct_bitmask_clone(bm);
if (!tmpl->bitmask) {
free(tmpl);
return NULL;
@@ -288,14 +207,14 @@ build_template_for_bitmask(struct ulogd_pluginstance *upi,
static struct ulogd_ipfix_template *
find_template_for_bitmask(struct ulogd_pluginstance *upi,
- struct bitmask *bm)
+ struct nfct_bitmask *bm)
{
struct ipfix_instance *ii = (struct ipfix_instance *) &upi->private;
struct ulogd_ipfix_template *tmpl;
/* FIXME: this can be done more efficient! */
llist_for_each_entry(tmpl, &ii->template_list, list) {
- if (bitmasks_equal(bm, tmpl->bitmask))
+ if (nfct_bitmask_equal(bm, tmpl->bitmask))
return tmpl;
}
return NULL;
@@ -313,13 +232,13 @@ static int output_ipfix(struct ulogd_pluginstance *upi)
* ulogd core could very easily flush it after every packet,
* too. */
- bitmask_clear(ii->valid_bitmask);
+ nfct_bitmask_clear(ii->valid_bitmask);
for (i = 0; i < upi->input.num_keys; i++) {
struct ulogd_key *key = upi->input.keys[i].u.source;
if (key->flags & ULOGD_RETF_VALID)
- bitmask_set_bit(ii->valid_bitmask, i);
+ nfct_bitmask_set_bit(ii->valid_bitmask, i);
}
/* lookup template ID for this bitmask */
@@ -430,7 +349,7 @@ static int start_ipfix(struct ulogd_pluginstance *pi)
ulogd_log(ULOGD_DEBUG, "starting ipfix\n");
- ii->valid_bitmask = bitmask_alloc(pi->input.num_keys);
+ ii->valid_bitmask = nfct_bitmask_new(pi->input.num_keys);
if (!ii->valid_bitmask)
return -ENOMEM;
@@ -443,7 +362,7 @@ static int start_ipfix(struct ulogd_pluginstance *pi)
return 0;
out_bm_free:
- bitmask_free(ii->valid_bitmask);
+ nfct_bitmask_destroy(ii->valid_bitmask);
ii->valid_bitmask = NULL;
return ret;
@@ -455,7 +374,7 @@ static int stop_ipfix(struct ulogd_pluginstance *pi)
close(ii->fd);
- bitmask_free(ii->valid_bitmask);
+ nfct_bitmask_destroy(ii->valid_bitmask);
ii->valid_bitmask = NULL;
return 0;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
