diff options
| author | Carlos Falgueras García <carlosfg@riseup.net> | 2016-03-22 20:46:27 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-04-14 02:20:01 +0200 |
| commit | 795d88cb710512d9b85afbb17beaeec3d92dcd54 (patch) | |
| tree | 1f705d76b500e596f827826008ebce0ad2db4c06 /src/netlink_linearize.c | |
| parent | 0128160cbfecd72a17fa920c343c37b9187d1c72 (diff) | |
rule: Use libnftnl user data TLV infrastructure
Now it is possible to store multiple variable length user data into rule.
Modify the parser in order to fill the nftnl_udata with the comment, and
the print function for extract these commentary and print it to user.
Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/netlink_linearize.c')
| -rw-r--r-- | src/netlink_linearize.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index bb51de73..32630436 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -21,6 +21,7 @@ #include <netinet/in.h> #include <linux/netfilter.h> +#include <libnftnl/udata.h> struct netlink_linearize_ctx { @@ -1171,9 +1172,27 @@ void netlink_linearize_rule(struct netlink_ctx *ctx, struct nftnl_rule *nlr, list_for_each_entry(stmt, &rule->stmts, list) netlink_gen_stmt(&lctx, stmt); - if (rule->comment) - nftnl_rule_set_data(nlr, NFTNL_RULE_USERDATA, - rule->comment, strlen(rule->comment) + 1); + if (rule->comment) { + struct nftnl_udata_buf *udata; + uint32_t udlen; + void *ud; + + udata = nftnl_udata_buf_alloc(NFT_USERDATA_MAXLEN); + if (!udata) + memory_allocation_error(); + + if (!nftnl_udata_put_strz(udata, UDATA_TYPE_COMMENT, + rule->comment)) + memory_allocation_error(); + + udlen = nftnl_udata_buf_len(udata); + ud = xmalloc(udlen); + memcpy(ud, nftnl_udata_buf_data(udata), udlen); + + nftnl_rule_set_data(nlr, NFTNL_RULE_USERDATA, ud, udlen); + + nftnl_udata_buf_free(udata); + } netlink_dump_rule(nlr); } |