diff options
| -rw-r--r-- | include/libnftnl/expr.h | 5 | ||||
| -rw-r--r-- | include/linux/netfilter/nf_tables.h | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/expr/dup.c | 217 | ||||
| -rw-r--r-- | src/expr_ops.c | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/nft-expr_dup-test.c | 94 |
7 files changed, 337 insertions, 0 deletions
diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index df5792a..4a37581 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -175,6 +175,11 @@ enum { NFTNL_EXPR_REDIR_FLAGS, }; +enum { + NFTNL_EXPR_DUP_SREG_ADDR = NFTNL_EXPR_BASE, + NFTNL_EXPR_DUP_SREG_DEV, +}; + /* * Compat */ diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 45898df..9796d82 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -945,6 +945,20 @@ enum nft_redir_attributes { #define NFTA_REDIR_MAX (__NFTA_REDIR_MAX - 1) /** + * enum nft_dup_attributes - nf_tables dup expression netlink attributes + * + * @NFTA_DUP_SREG_ADDR: source register of destination (NLA_U32: nft_registers) + * @NFTA_DUP_SREG_DEV: output interface name (NLA_U32: nft_register) + */ +enum nft_dup_attributes { + NFTA_DUP_UNSPEC, + NFTA_DUP_SREG_ADDR, + NFTA_DUP_SREG_DEV, + __NFTA_DUP_MAX +}; +#define NFTA_DUP_MAX (__NFTA_DUP_MAX - 1) + +/** * enum nft_gen_attributes - nf_tables ruleset generation attributes * * @NFTA_GEN_ID: Ruleset generation ID (NLA_U32) diff --git a/src/Makefile.am b/src/Makefile.am index dd87240..107cae5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,6 +26,7 @@ libnftnl_la_SOURCES = utils.c \ expr/counter.c \ expr/ct.c \ expr/data_reg.c \ + expr/dup.c \ expr/exthdr.c \ expr/limit.c \ expr/log.c \ diff --git a/src/expr/dup.c b/src/expr/dup.c new file mode 100644 index 0000000..6498972 --- /dev/null +++ b/src/expr/dup.c @@ -0,0 +1,217 @@ +/* + * (C) 2015 Pablo Neira Ayuso <pablo@netfilter.org> + * + * 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 <stdint.h> +#include <string.h> +#include <arpa/inet.h> +#include <errno.h> +#include "internal.h" +#include <libmnl/libmnl.h> +#include <linux/netfilter/nf_tables.h> +#include <libnftnl/expr.h> +#include <libnftnl/rule.h> +#include "expr_ops.h" +#include "data_reg.h" +#include <buffer.h> + +struct nftnl_expr_dup { + enum nft_registers sreg_addr; + enum nft_registers sreg_dev; +}; + +static int nftnl_expr_dup_set(struct nftnl_expr *e, uint16_t type, + const void *data, uint32_t data_len) +{ + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + + switch (type) { + case NFTNL_EXPR_DUP_SREG_ADDR: + dup->sreg_addr = *((uint32_t *)data); + break; + case NFTNL_EXPR_DUP_SREG_DEV: + dup->sreg_dev= *((uint32_t *)data); + break; + default: + return -1; + } + return 0; +} + +static const void *nftnl_expr_dup_get(const struct nftnl_expr *e, + uint16_t type, uint32_t *data_len) +{ + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + + switch (type) { + case NFTNL_EXPR_DUP_SREG_ADDR: + *data_len = sizeof(dup->sreg_addr); + return &dup->sreg_addr; + case NFTNL_EXPR_DUP_SREG_DEV: + *data_len = sizeof(dup->sreg_dev); + return &dup->sreg_dev; + } + return NULL; +} + +static int nftnl_expr_dup_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_DUP_MAX) < 0) + return MNL_CB_OK; + + switch (type) { + case NFTA_DUP_SREG_ADDR: + case NFTA_DUP_SREG_DEV: + if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) + abi_breakage(); + break; + } + + tb[type] = attr; + return MNL_CB_OK; +} + +static void nftnl_expr_dup_build(struct nlmsghdr *nlh, struct nftnl_expr *e) +{ + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + + if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_ADDR)) + mnl_attr_put_u32(nlh, NFTA_DUP_SREG_ADDR, htonl(dup->sreg_addr)); + if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_DEV)) + mnl_attr_put_u32(nlh, NFTA_DUP_SREG_DEV, htonl(dup->sreg_dev)); +} + +static int nftnl_expr_dup_parse(struct nftnl_expr *e, struct nlattr *attr) +{ + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + struct nlattr *tb[NFTA_DUP_MAX + 1] = {}; + int ret = 0; + + if (mnl_attr_parse_nested(attr, nftnl_expr_dup_cb, tb) < 0) + return -1; + + if (tb[NFTA_DUP_SREG_ADDR]) { + dup->sreg_addr = ntohl(mnl_attr_get_u32(tb[NFTA_DUP_SREG_ADDR])); + e->flags |= (1 << NFTNL_EXPR_DUP_SREG_ADDR); + } + if (tb[NFTA_DUP_SREG_DEV]) { + dup->sreg_dev = ntohl(mnl_attr_get_u32(tb[NFTA_DUP_SREG_DEV])); + e->flags |= (1 << NFTNL_EXPR_DUP_SREG_DEV); + } + + return ret; +} + +static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root, + struct nftnl_parse_err *err) +{ +#ifdef JSON_PARSING + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + uint32_t sreg_addr, sreg_dev; + int datareg_type; + + ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err); + if (ret >= 0) + nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_addr); + ret = nftnl_jansson_parse_val(root, "sreg_dev", NFT_TYPE_U32, &sreg_dev, err); + if (ret >= 0) + nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev); + + + return 0; +#else + errno = EOPNOTSUPP; + return -1; +#endif +} + +static int nftnl_expr_dup_xml_parse(struct nftnl_expr *e, mxml_node_t *tree, + struct nftnl_parse_err *err) +{ +#ifdef XML_PARSING + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + uint32_t sreg_addr, sreg_dev; + + if (nftnl_mxml_reg_parse(tree, "sreg_addr", &sreg_addr, MXML_DESCEND_FIRST, + NFT_XML_OPT, err) == 0) + nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_ADDR, sreg_addr); + if (nftnl_mxml_reg_parse(tree, "sreg_dev", &sreg_dev, MXML_DESCEND_FIRST, + NFT_XML_OPT, err) == 0) + nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev); + + return 0; +#else + errno = EOPNOTSUPP; + return -1; +#endif +} + +static int nftnl_expr_dup_export(char *buf, size_t size, struct nftnl_expr *e, + int type) +{ + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + NFTNL_BUF_INIT(b, buf, size); + + if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_ADDR)) + nftnl_buf_u32(&b, type, dup->sreg_addr, "sreg_addr"); + if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_DEV)) + nftnl_buf_u32(&b, type, dup->sreg_addr, "sreg_dev"); + + return nftnl_buf_done(&b); +} + +static int nftnl_expr_dup_snprintf_default(char *buf, size_t len, + struct nftnl_expr *e, uint32_t flags) +{ + int size = len, offset = 0, ret; + struct nftnl_expr_dup *dup = nftnl_expr_data(e); + + if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_ADDR)) { + ret = snprintf(buf + offset, len, "sreg_addr %u", dup->sreg_addr); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_DEV)) { + ret = snprintf(buf + offset, len, "sreg_dev %u", dup->sreg_dev); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + return offset; +} + +static int nftnl_expr_dup_snprintf(char *buf, size_t len, uint32_t type, + uint32_t flags, struct nftnl_expr *e) +{ + switch (type) { + case NFTNL_OUTPUT_DEFAULT: + return nftnl_expr_dup_snprintf_default(buf, len, e, flags); + case NFTNL_OUTPUT_XML: + case NFTNL_OUTPUT_JSON: + return nftnl_expr_dup_export(buf, len, e, type); + default: + break; + } + return -1; +} + +struct expr_ops expr_ops_dup = { + .name = "dup", + .alloc_len = sizeof(struct nftnl_expr_dup), + .max_attr = NFTA_DUP_MAX, + .set = nftnl_expr_dup_set, + .get = nftnl_expr_dup_get, + .parse = nftnl_expr_dup_parse, + .build = nftnl_expr_dup_build, + .snprintf = nftnl_expr_dup_snprintf, + .xml_parse = nftnl_expr_dup_xml_parse, + .json_parse = nftnl_expr_dup_json_parse, +}; diff --git a/src/expr_ops.c b/src/expr_ops.c index fcc128f..bfb3ba2 100644 --- a/src/expr_ops.c +++ b/src/expr_ops.c @@ -9,6 +9,7 @@ extern struct expr_ops expr_ops_byteorder; extern struct expr_ops expr_ops_cmp; extern struct expr_ops expr_ops_counter; extern struct expr_ops expr_ops_ct; +extern struct expr_ops expr_ops_dup; extern struct expr_ops expr_ops_exthdr; extern struct expr_ops expr_ops_immediate; extern struct expr_ops expr_ops_limit; @@ -31,6 +32,7 @@ static struct expr_ops *expr_ops[] = { &expr_ops_cmp, &expr_ops_counter, &expr_ops_ct, + &expr_ops_dup, &expr_ops_exthdr, &expr_ops_immediate, &expr_ops_limit, diff --git a/tests/Makefile.am b/tests/Makefile.am index c0356f1..51403e5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,6 +14,7 @@ check_PROGRAMS = nft-parsing-test \ nft-expr_counter-test \ nft-expr_cmp-test \ nft-expr_ct-test \ + nft-expr_dup-test \ nft-expr_exthdr-test \ nft-expr_immediate-test \ nft-expr_limit-test \ @@ -62,6 +63,9 @@ nft_expr_exthdr_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} nft_expr_ct_test_SOURCES = nft-expr_ct-test.c nft_expr_ct_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} +nft_expr_dup_test_SOURCES = nft-expr_dup-test.c +nft_expr_dup_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} + nft_expr_immediate_test_SOURCES = nft-expr_counter-test.c nft_expr_immediate_test_LDADD = ../src/libnftnl.la ${LIBMNL_LIBS} diff --git a/tests/nft-expr_dup-test.c b/tests/nft-expr_dup-test.c new file mode 100644 index 0000000..3c37d4a --- /dev/null +++ b/tests/nft-expr_dup-test.c @@ -0,0 +1,94 @@ +/* + * (C) 2013 by Ana Rey Botello <anarey@gmail.com> + * + * 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 <stdlib.h> +#include <string.h> +#include <netinet/in.h> +#include <netinet/ip.h> + +#include <linux/netfilter/nf_tables.h> +#include <libmnl/libmnl.h> +#include <libnftnl/rule.h> +#include <libnftnl/expr.h> + +static int test_ok = 1; +static void print_err(const char *msg) +{ + test_ok = 0; + printf("\033[31mERROR:\e[0m %s\n", msg); +} + +static void cmp_nftnl_expr(struct nftnl_expr *rule_a, + struct nftnl_expr *rule_b) +{ + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_DUP_SREG_ADDR) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_DUP_SREG_ADDR)) + print_err("Expr SREG_TO mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_DUP_SREG_DEV) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_DUP_SREG_DEV)) + print_err("Expr SREG_OIF mismatches"); +} + +int main(int argc, char *argv[]) +{ + struct nftnl_rule *a, *b; + struct nftnl_expr *ex; + struct nlmsghdr *nlh; + char buf[4096]; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; + + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); + if (a == NULL || b == NULL) + print_err("OOM"); + ex = nftnl_expr_alloc("dup"); + if (ex == NULL) + print_err("OOM"); + + nftnl_expr_set_u32(ex, NFTNL_EXPR_DUP_SREG_ADDR, 0x12345678); + nftnl_expr_set_u32(ex, NFTNL_EXPR_DUP_SREG_DEV, 0x78123456); + + nftnl_rule_add_expr(a, ex); + + nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); + nftnl_rule_nlmsg_build_payload(nlh, a); + + if (nftnl_rule_nlmsg_parse(nlh, b) < 0) + print_err("parsing problems"); + + iter_a = nftnl_expr_iter_create(a); + iter_b = nftnl_expr_iter_create(b); + if (iter_a == NULL || iter_b == NULL) + print_err("OOM"); + + rule_a = nftnl_expr_iter_next(iter_a); + rule_b = nftnl_expr_iter_next(iter_b); + if (rule_a == NULL || rule_b == NULL) + print_err("OOM"); + + cmp_nftnl_expr(rule_a, rule_b); + + if (nftnl_expr_iter_next(iter_a) != NULL || + nftnl_expr_iter_next(iter_b) != NULL) + print_err("More 1 expr."); + + nftnl_expr_iter_destroy(iter_a); + nftnl_expr_iter_destroy(iter_b); + nftnl_rule_free(a); + nftnl_rule_free(b); + + if (!test_ok) + exit(EXIT_FAILURE); + + printf("%s: \033[32mOK\e[0m\n", argv[0]); + return EXIT_SUCCESS; +} |