[PATCH libnftnl 2/5] expr: add xfrm support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
 include/libnftnl/expr.h             |   8 +
 include/linux/netfilter/nf_tables.h |  29 ++++
 src/Makefile.am                     |   1 +
 src/expr/xfrm.c                     | 325 ++++++++++++++++++++++++++++++++++++
 src/expr_ops.c                      |   2 +
 5 files changed, 365 insertions(+)
 create mode 100644 src/expr/xfrm.c

diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h
index b0a0a851766d..6285c6fc8722 100644
--- a/include/libnftnl/expr.h
+++ b/include/libnftnl/expr.h
@@ -283,6 +283,14 @@ enum {
 	NFTNL_EXPR_OSF_DREG	= NFTNL_EXPR_BASE,
 };
 
+enum {
+	NFTNL_EXPR_XFRM_DREG	= NFTNL_EXPR_BASE,
+	NFTNL_EXPR_XFRM_SREG,
+	NFTNL_EXPR_XFRM_KEY,
+	NFTNL_EXPR_XFRM_DIR,
+	NFTNL_EXPR_XFRM_SPNUM,
+};
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index da2dda9760eb..da2c2917bd03 100644
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -1495,6 +1495,35 @@ enum nft_devices_attributes {
 };
 #define NFTA_DEVICE_MAX		(__NFTA_DEVICE_MAX - 1)
 
+/*
+ * enum nft_xfrm_attributes - nf_tables xfrm expr netlink attributes
+ *
+ * @NFTA_XFRM_DREG: destination register (NLA_U32)
+ * @NFTA_XFRM_KEY: enum nft_xfrm_keys (NLA_U32)
+ * @NFTA_XFRM_DIR: direction (NLA_U8)
+ * @NFTA_XFRM_SPNUM: index in secpath array (NLA_U32)
+ */
+enum nft_xfrm_attributes {
+	NFTA_XFRM_UNSPEC,
+	NFTA_XFRM_DREG,
+	NFTA_XFRM_KEY,
+	NFTA_XFRM_DIR,
+	NFTA_XFRM_SPNUM,
+	__NFTA_XFRM_MAX
+};
+#define NFTA_XFRM_MAX (__NFTA_XFRM_MAX - 1)
+
+enum nft_xfrm_keys {
+	NFT_XFRM_KEY_UNSPEC,
+	NFT_XFRM_KEY_DADDR_IP4,
+	NFT_XFRM_KEY_DADDR_IP6,
+	NFT_XFRM_KEY_SADDR_IP4,
+	NFT_XFRM_KEY_SADDR_IP6,
+	NFT_XFRM_KEY_REQID,
+	NFT_XFRM_KEY_SPI,
+	__NFT_XFRM_KEY_MAX,
+};
+#define NFT_XFRM_KEY_MAX (__NFT_XFRM_KEY_MAX - 1)
 
 /**
  * enum nft_trace_attributes - nf_tables trace netlink attributes
diff --git a/src/Makefile.am b/src/Makefile.am
index b5ec07970cd7..05dbeaa4ed92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,6 +59,7 @@ libnftnl_la_SOURCES = utils.c		\
 		      expr/hash.c	\
 		      expr/socket.c	\
 		      expr/osf.c	\
+		      expr/xfrm.c	\
 		      obj/counter.c	\
 		      obj/ct_helper.c	\
 		      obj/quota.c	\
diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
new file mode 100644
index 000000000000..b159d60d1e3f
--- /dev/null
+++ b/src/expr/xfrm.c
@@ -0,0 +1,325 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <linux/netfilter/nf_tables.h>
+#include <linux/xfrm.h>
+
+#include "internal.h"
+#include <libmnl/libmnl.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/rule.h>
+
+struct nftnl_expr_xfrm {
+	enum nft_registers	dreg;
+	enum nft_xfrm_keys	key;
+	uint32_t		spnum;
+	uint8_t			dir;
+};
+
+static int
+nftnl_expr_xfrm_set(struct nftnl_expr *e, uint16_t type,
+		    const void *data, uint32_t data_len)
+{
+	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
+
+	switch(type) {
+	case NFTNL_EXPR_XFRM_KEY:
+		x->key = *((uint32_t *)data);
+		break;
+	case NFTNL_EXPR_XFRM_DIR:
+		x->dir = *((uint8_t *)data);
+		break;
+	case NFTNL_EXPR_XFRM_SPNUM:
+		x->spnum = *((uint32_t *)data);
+		break;
+	case NFTNL_EXPR_XFRM_DREG:
+		x->dreg = *((uint32_t *)data);
+		break;
+	default:
+		return -1;
+	}
+	return 0;
+}
+
+static const void *
+nftnl_expr_xfrm_get(const struct nftnl_expr *e, uint16_t type,
+		    uint32_t *data_len)
+{
+	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
+
+	switch(type) {
+	case NFTNL_EXPR_XFRM_KEY:
+		*data_len = sizeof(x->key);
+		return &x->key;
+	case NFTNL_EXPR_XFRM_DIR:
+		*data_len = sizeof(x->dir);
+		return &x->dir;
+	case NFTNL_EXPR_XFRM_SPNUM:
+		*data_len = sizeof(x->spnum);
+		return &x->spnum;
+	case NFTNL_EXPR_XFRM_DREG:
+		*data_len = sizeof(x->dreg);
+		return &x->dreg;
+	}
+	return NULL;
+}
+
+static int nftnl_expr_xfrm_cb(const struct nlattr *attr, void *data)
+{
+	const struct nlattr **tb = data;
+	int type = mnl_attr_get_type(attr);
+
+	if (mnl_attr_type_valid(attr, NFTA_XFRM_MAX) < 0)
+		return MNL_CB_OK;
+
+	switch (type) {
+	case NFTA_XFRM_DREG:
+	case NFTA_XFRM_KEY:
+	case NFTA_XFRM_SPNUM:
+		if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+			abi_breakage();
+		break;
+	case NFTA_XFRM_DIR:
+		if (mnl_attr_validate(attr, MNL_TYPE_U8) < 0)
+			abi_breakage();
+		break;
+	}
+
+	tb[type] = attr;
+	return MNL_CB_OK;
+}
+
+static void
+nftnl_expr_xfrm_build(struct nlmsghdr *nlh, const struct nftnl_expr *e)
+{
+	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
+
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_KEY))
+		mnl_attr_put_u32(nlh, NFTA_XFRM_KEY, htonl(x->key));
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_DIR))
+		mnl_attr_put_u8(nlh, NFTA_XFRM_DIR, x->dir);
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_SPNUM))
+		mnl_attr_put_u32(nlh, NFTA_XFRM_SPNUM, htonl(x->spnum));
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_DREG))
+		mnl_attr_put_u32(nlh, NFTA_XFRM_DREG, htonl(x->dreg));
+}
+
+static int
+nftnl_expr_xfrm_parse(struct nftnl_expr *e, struct nlattr *attr)
+{
+	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
+	struct nlattr *tb[NFTA_XFRM_MAX+1] = {};
+
+	if (mnl_attr_parse_nested(attr, nftnl_expr_xfrm_cb, tb) < 0)
+		return -1;
+
+	if (tb[NFTA_XFRM_KEY]) {
+		x->key = ntohl(mnl_attr_get_u32(tb[NFTA_XFRM_KEY]));
+		e->flags |= (1 << NFTNL_EXPR_XFRM_KEY);
+	}
+	if (tb[NFTA_XFRM_DIR]) {
+		x->dir = mnl_attr_get_u8(tb[NFTA_XFRM_DIR]);
+		e->flags |= (1 << NFTNL_EXPR_XFRM_DIR);
+	}
+	if (tb[NFTA_XFRM_SPNUM]) {
+		x->spnum = ntohl(mnl_attr_get_u32(tb[NFTA_XFRM_SPNUM]));
+		e->flags |= (1 << NFTNL_EXPR_XFRM_SPNUM);
+	}
+	if (tb[NFTA_XFRM_DREG]) {
+		x->dreg = ntohl(mnl_attr_get_u32(tb[NFTA_XFRM_DREG]));
+		e->flags |= (1 << NFTNL_EXPR_XFRM_DREG);
+	}
+	return 0;
+}
+
+static const char *xfrmkey2str_array[] = {
+	[NFT_XFRM_KEY_DADDR_IP4]	= "daddr4",
+	[NFT_XFRM_KEY_SADDR_IP4]	= "saddr4",
+	[NFT_XFRM_KEY_DADDR_IP6]	= "daddr6",
+	[NFT_XFRM_KEY_SADDR_IP6]	= "saddr6",
+	[NFT_XFRM_KEY_REQID]		= "reqid",
+	[NFT_XFRM_KEY_SPI]		= "spi",
+};
+
+static const char *xfrmkey2str(uint32_t key)
+{
+	if (key >= sizeof(xfrmkey2str_array) / sizeof(xfrmkey2str_array[0]))
+		return "unknown";
+
+	return xfrmkey2str_array[key];
+}
+
+static const char *xfrmdir2str_array[] = {
+	[XFRM_POLICY_IN]	= "in",
+	[XFRM_POLICY_OUT]	= "out",
+};
+
+static const char *xfrmdir2str(uint8_t dir)
+{
+	if (dir >= sizeof(xfrmdir2str_array) / sizeof(xfrmdir2str_array[0]))
+		return "unknown";
+
+	return xfrmdir2str_array[dir];
+}
+
+#ifdef JSON_PARSING
+static uint32_t str2xfrmkey(const char *s)
+{
+	int i;
+
+	for (i = 0;
+	     i < sizeof(xfrmkey2str_array) / sizeof(xfrmkey2str_array[0]);
+	     i++) {
+		if (strcmp(xfrmkey2str_array[i], s) == 0)
+			return i;
+	}
+	return -1;
+}
+
+static int str2xfmrdir(const char *s)
+{
+	int i;
+
+	for (i = 0;
+	     i <  sizeof(xfrmdir2str_array) / sizeof(xfrmdir2str_array[0]);
+	     i++) {
+		if (strcmp(xfrmkey2str_array[i], s) == 0)
+			return i;
+	}
+	return -1;
+}
+#endif
+
+static int nftnl_expr_xfrm_json_parse(struct nftnl_expr *e, json_t *root,
+				      struct nftnl_parse_err *err)
+{
+#ifdef JSON_PARSING
+	const char *key_str, *dir_str;
+	uint32_t reg, key, spnum;
+	uint8_t dir;
+
+	if (nftnl_jansson_parse_reg(root, "dreg", NFTNL_TYPE_U32, &reg, err) == 0)
+		nftnl_expr_set_u32(e, NFTNL_EXPR_XFRM_DREG, reg);
+
+	key_str = nftnl_jansson_parse_str(root, "key", err);
+	if (key_str != NULL) {
+		key = str2xfrmkey(key_str);
+		if (key < 0)
+			return -1;
+
+		nftnl_expr_set_u32(e, NFTNL_EXPR_XFRM_KEY, key);
+	}
+
+	dir_str = nftnl_jansson_parse_str(root, "dir", err);
+	if (dir_str != NULL) {
+		dir = str2xfmrdir(dir_str);
+		if (dir == -1) {
+			err->node_name = "dir";
+			err->error = NFTNL_PARSE_EBADTYPE;
+			goto err;
+		}
+		nftnl_expr_set_u8(e, NFTNL_EXPR_XFRM_DIR, dir);
+	}
+
+	return 0;
+err:
+	errno = EINVAL;
+	return -1;
+#else
+	errno = EOPNOTSUPP;
+	return -1;
+#endif
+}
+
+static int
+nftnl_expr_xfrm_export(char *buf, size_t size, const struct nftnl_expr *e,
+		     int type)
+{
+	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
+	NFTNL_BUF_INIT(b, buf, size);
+
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_DREG))
+		nftnl_buf_u32(&b, type, x->dreg, DREG);
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_KEY))
+		nftnl_buf_str(&b, type, xfrmkey2str(x->key), KEY);
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_DIR))
+		nftnl_buf_str(&b, type, xfrmdir2str(x->dir), DIR);
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_SPNUM))
+		nftnl_buf_u32(&b, type, x->spnum, NUM);
+
+	return nftnl_buf_done(&b);
+}
+
+static int
+nftnl_expr_xfrm_snprintf_default(char *buf, size_t size,
+			       const struct nftnl_expr *e)
+{
+	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
+	int ret, remain = size, offset = 0;
+
+	if (e->flags & (1 << NFTNL_EXPR_XFRM_DREG)) {
+		ret = snprintf(buf, remain, "load %s %u %s => reg %u ",
+				xfrmdir2str(x->dir),
+				x->spnum,
+			        xfrmkey2str(x->key), x->dreg);
+		SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+	}
+	return offset;
+}
+
+static int
+nftnl_expr_xfrm_snprintf(char *buf, size_t len, uint32_t type,
+			 uint32_t flags, const struct nftnl_expr *e)
+{
+	switch (type) {
+	case NFTNL_OUTPUT_DEFAULT:
+		return nftnl_expr_xfrm_snprintf_default(buf, len, e);
+	case NFTNL_OUTPUT_XML:
+	case NFTNL_OUTPUT_JSON:
+		return nftnl_expr_xfrm_export(buf, len, e, type);
+	default:
+		break;
+	}
+	return -1;
+}
+
+static bool nftnl_expr_xfrm_cmp(const struct nftnl_expr *e1,
+				const struct nftnl_expr *e2)
+{
+	struct nftnl_expr_xfrm *x1 = nftnl_expr_data(e1);
+	struct nftnl_expr_xfrm *x2 = nftnl_expr_data(e2);
+	bool eq = true;
+
+	if (e1->flags & (1 << NFTNL_EXPR_XFRM_KEY))
+		eq &= (x1->key == x2->key);
+	if (e1->flags & (1 << NFTNL_EXPR_XFRM_DIR))
+		eq &= (x1->dir == x2->dir);
+	if (e1->flags & (1 << NFTNL_EXPR_XFRM_SPNUM))
+		eq &= (x1->spnum == x2->spnum);
+	if (e1->flags & (1 << NFTNL_EXPR_XFRM_DREG))
+		eq &= (x1->dreg == x2->dreg);
+
+	return eq;
+}
+
+struct expr_ops expr_ops_xfrm = {
+	.name		= "xfrm",
+	.alloc_len	= sizeof(struct nftnl_expr_xfrm),
+	.max_attr	= NFTA_XFRM_MAX,
+	.cmp		= nftnl_expr_xfrm_cmp,
+	.set		= nftnl_expr_xfrm_set,
+	.get		= nftnl_expr_xfrm_get,
+	.parse		= nftnl_expr_xfrm_parse,
+	.build		= nftnl_expr_xfrm_build,
+	.snprintf	= nftnl_expr_xfrm_snprintf,
+	.json_parse	= nftnl_expr_xfrm_json_parse,
+};
diff --git a/src/expr_ops.c b/src/expr_ops.c
index d418c3e84501..051140fb1326 100644
--- a/src/expr_ops.c
+++ b/src/expr_ops.c
@@ -39,6 +39,7 @@ extern struct expr_ops expr_ops_flow;
 extern struct expr_ops expr_ops_socket;
 extern struct expr_ops expr_ops_tunnel;
 extern struct expr_ops expr_ops_osf;
+extern struct expr_ops expr_ops_xfrm;
 
 static struct expr_ops expr_ops_notrack = {
 	.name	= "notrack",
@@ -81,6 +82,7 @@ static struct expr_ops *expr_ops[] = {
 	&expr_ops_socket,
 	&expr_ops_tunnel,
 	&expr_ops_osf,
+	&expr_ops_xfrm,
 	NULL,
 };
 
-- 
2.16.4




[Index of Archives]     [Netfitler Users]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux