]> git.ipfire.org Git - thirdparty/libnftnl.git/commitdiff
src: ct helper support
authorFlorian Westphal <fw@strlen.de>
Sun, 19 Feb 2017 21:49:51 +0000 (22:49 +0100)
committerFlorian Westphal <fw@strlen.de>
Thu, 16 Mar 2017 09:08:59 +0000 (10:08 +0100)
add support for ct helper objects, these are used to assign helpers to
connections, similar to iptables -j CT --set-helper target.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/libnftnl/object.h
include/linux/netfilter/nf_tables.h
include/obj.h
src/Makefile.am
src/obj/ct_helper.c [new file with mode: 0644]
src/object.c

index ca3abeae66cc11f8957b00aad7ac2789c8fb5f69..ccd9d19b93645fb81b785d5cd4238e26a63fc358 100644 (file)
@@ -34,6 +34,12 @@ enum {
        NFTNL_OBJ_QUOTA_FLAGS,
 };
 
+enum {
+       NFTNL_OBJ_CT_HELPER_NAME = NFTNL_OBJ_BASE,
+       NFTNL_OBJ_CT_HELPER_L3PROTO,
+       NFTNL_OBJ_CT_HELPER_L4PROTO,
+};
+
 struct nftnl_obj;
 
 struct nftnl_obj *nftnl_obj_alloc(void);
index a9280a6541ac6104586e4c86c90466a087b13db6..8f3842690d176bb6d847e4a157dfc404d0e6f0f1 100644 (file)
@@ -1260,10 +1260,20 @@ enum nft_fib_flags {
        NFTA_FIB_F_PRESENT      = 1 << 5,       /* check existence only */
 };
 
+enum nft_ct_helper_attributes {
+       NFTA_CT_HELPER_UNSPEC,
+       NFTA_CT_HELPER_NAME,
+       NFTA_CT_HELPER_L3PROTO,
+       NFTA_CT_HELPER_L4PROTO,
+       __NFTA_CT_HELPER_MAX,
+};
+#define NFTA_CT_HELPER_MAX     (__NFTA_CT_HELPER_MAX - 1)
+
 #define NFT_OBJECT_UNSPEC      0
 #define NFT_OBJECT_COUNTER     1
 #define NFT_OBJECT_QUOTA       2
-#define __NFT_OBJECT_MAX       3
+#define NFT_OBJECT_CT_HELPER   3
+#define __NFT_OBJECT_MAX       4
 #define NFT_OBJECT_MAX         (__NFT_OBJECT_MAX - 1)
 
 /**
index edbf023f5cdd39d8af08199c896caf584985261f..d90919f2d86b5a92919e2dc860305688db8839dd 100644 (file)
@@ -30,6 +30,11 @@ struct nftnl_obj {
                        uint64_t        consumed;
                        uint32_t        flags;
                } quota;
+               struct nftnl_obj_ct_helper {
+                       uint16_t        l3proto;
+                       uint8_t         l4proto;
+                       char            name[16];
+               } ct_helper;
        } data;
 };
 
@@ -49,6 +54,7 @@ struct obj_ops {
 
 extern struct obj_ops obj_ops_counter;
 extern struct obj_ops obj_ops_quota;
+extern struct obj_ops obj_ops_ct_helper;
 
 #define nftnl_obj_data(obj) (void *)&obj->data
 
index 485a8c4acbef126b22007327113eb4e969b5e491..77b67b2676721edc82f652f4a18643dac54600da 100644 (file)
@@ -53,5 +53,6 @@ libnftnl_la_SOURCES = utils.c         \
                      expr/redir.c      \
                      expr/hash.c       \
                      obj/counter.c     \
+                     obj/ct_helper.c   \
                      obj/quota.c       \
                      libnftnl.map
diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
new file mode 100644 (file)
index 0000000..d6d3111
--- /dev/null
@@ -0,0 +1,210 @@
+/*
+ * (C) 2017 Red Hat GmbH
+ * Author: Florian Westphal <fw@strlen.de>
+ *
+ * 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 <arpa/inet.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include <linux/netfilter/nf_tables.h>
+
+#include "internal.h"
+#include <libmnl/libmnl.h>
+#include <libnftnl/object.h>
+
+#include "obj.h"
+
+static int nftnl_obj_ct_helper_set(struct nftnl_obj *e, uint16_t type,
+                                  const void *data, uint32_t data_len)
+{
+       struct nftnl_obj_ct_helper *helper = nftnl_obj_data(e);
+
+       switch (type) {
+       case NFTNL_OBJ_CT_HELPER_NAME:
+               snprintf(helper->name, sizeof(helper->name), "%s", (const char *)data);
+               break;
+       case NFTNL_OBJ_CT_HELPER_L3PROTO:
+               helper->l3proto = *((uint16_t *)data);
+               break;
+       case NFTNL_OBJ_CT_HELPER_L4PROTO:
+               helper->l4proto = *((uint8_t *)data);
+               break;
+       default:
+               return -1;
+       }
+       return 0;
+}
+
+static const void *nftnl_obj_ct_helper_get(const struct nftnl_obj *e,
+                                          uint16_t type, uint32_t *data_len)
+{
+       struct nftnl_obj_ct_helper *helper = nftnl_obj_data(e);
+
+       switch (type) {
+       case NFTNL_OBJ_CT_HELPER_NAME:
+               *data_len = strlen(helper->name);
+               return helper->name;
+       case NFTNL_OBJ_CT_HELPER_L3PROTO:
+               *data_len = sizeof(helper->l3proto);
+               return &helper->l3proto;
+       case NFTNL_OBJ_CT_HELPER_L4PROTO:
+               *data_len = sizeof(helper->l4proto);
+               return &helper->l4proto;
+       }
+       return NULL;
+}
+
+static int nftnl_obj_ct_helper_cb(const struct nlattr *attr, void *data)
+{
+       const struct nftnl_obj_ct_helper *helper = NULL;
+       int type = mnl_attr_get_type(attr);
+       const struct nlattr **tb = data;
+
+       if (mnl_attr_type_valid(attr, NFTA_CT_HELPER_MAX) < 0)
+               return MNL_CB_OK;
+
+       switch (type) {
+       case NFTA_CT_HELPER_NAME:
+               if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0)
+                       abi_breakage();
+               if (mnl_attr_get_payload_len(attr) >= sizeof(helper->name))
+                       abi_breakage();
+               break;
+       case NFTA_CT_HELPER_L3PROTO:
+               if (mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+                       abi_breakage();
+               break;
+       case NFTA_CT_HELPER_L4PROTO:
+               if (mnl_attr_validate(attr, MNL_TYPE_U8) < 0)
+                       abi_breakage();
+               break;
+       }
+
+       tb[type] = attr;
+       return MNL_CB_OK;
+}
+
+static void
+nftnl_obj_ct_helper_build(struct nlmsghdr *nlh, const struct nftnl_obj *e)
+{
+       struct nftnl_obj_ct_helper *helper = nftnl_obj_data(e);
+
+       if (e->flags & (1 << NFTNL_OBJ_CT_HELPER_NAME))
+               mnl_attr_put_str(nlh, NFTA_CT_HELPER_NAME, helper->name);
+       if (e->flags & (1 << NFTNL_OBJ_CT_HELPER_L3PROTO))
+               mnl_attr_put_u16(nlh, NFTA_CT_HELPER_L3PROTO, htons(helper->l3proto));
+       if (e->flags & (1 << NFTNL_OBJ_CT_HELPER_L4PROTO))
+               mnl_attr_put_u8(nlh, NFTA_CT_HELPER_L4PROTO, helper->l4proto);
+}
+
+static int
+nftnl_obj_ct_helper_parse(struct nftnl_obj *e, struct nlattr *attr)
+{
+       struct nftnl_obj_ct_helper *helper = nftnl_obj_data(e);
+       struct nlattr *tb[NFTA_CT_HELPER_MAX + 1] = {};
+
+       if (mnl_attr_parse_nested(attr, nftnl_obj_ct_helper_cb, tb) < 0)
+               return -1;
+
+       if (tb[NFTA_CT_HELPER_NAME]) {
+               snprintf(helper->name, sizeof(helper->name), "%s",
+                        mnl_attr_get_str(tb[NFTA_CT_HELPER_NAME]));
+               e->flags |= (1 << NFTNL_OBJ_CT_HELPER_NAME);
+       }
+       if (tb[NFTA_CT_HELPER_L3PROTO]) {
+               helper->l3proto = ntohs(mnl_attr_get_u16(tb[NFTA_CT_HELPER_L3PROTO]));
+               e->flags |= (1 << NFTNL_OBJ_CT_HELPER_L3PROTO);
+       }
+       if (tb[NFTA_CT_HELPER_L4PROTO]) {
+               helper->l4proto = mnl_attr_get_u8(tb[NFTA_CT_HELPER_L4PROTO]);
+               e->flags |= (1 << NFTNL_OBJ_CT_HELPER_L4PROTO);
+       }
+
+       return 0;
+}
+
+static int
+nftnl_obj_quota_json_parse(struct nftnl_obj *e, json_t *root,
+                                struct nftnl_parse_err *err)
+{
+#ifdef JSON_PARSING
+       uint64_t bytes;
+       uint32_t flags;
+
+       if (nftnl_jansson_parse_val(root, "bytes", NFTNL_TYPE_U64, &bytes,
+                                 err) == 0)
+               nftnl_obj_set_u64(e, NFTNL_OBJ_QUOTA_BYTES, bytes);
+       if (nftnl_jansson_parse_val(root, "consumed", NFTNL_TYPE_U64, &bytes,
+                                   err) == 0)
+               nftnl_obj_set_u64(e, NFTNL_OBJ_QUOTA_CONSUMED, bytes);
+       if (nftnl_jansson_parse_val(root, "flags", NFTNL_TYPE_U32, &flags,
+                                 err) == 0)
+               nftnl_obj_set_u32(e, NFTNL_OBJ_QUOTA_FLAGS, flags);
+
+       return 0;
+#else
+       errno = EOPNOTSUPP;
+       return -1;
+#endif
+}
+
+static int nftnl_obj_ct_helper_export(char *buf, size_t size,
+                                  const struct nftnl_obj *e, int type)
+{
+       struct nftnl_obj_ct_helper *helper = nftnl_obj_data(e);
+       NFTNL_BUF_INIT(b, buf, size);
+
+       if (e->flags & (1 << NFTNL_OBJ_CT_HELPER_NAME))
+               nftnl_buf_str(&b, type, helper->name, NAME);
+       if (e->flags & (1 << NFTNL_OBJ_CT_HELPER_L3PROTO))
+               nftnl_buf_u32(&b, type, helper->l3proto, FAMILY);
+       if (e->flags & (1 << NFTNL_OBJ_CT_HELPER_L4PROTO))
+               nftnl_buf_u32(&b, type, helper->l4proto, "service");
+
+       return nftnl_buf_done(&b);
+}
+
+static int nftnl_obj_ct_helper_snprintf_default(char *buf, size_t len,
+                                              const struct nftnl_obj *e)
+{
+       struct nftnl_obj_ct_helper *helper = nftnl_obj_data(e);
+
+       return snprintf(buf, len, "name %s family %d protocol %d ",
+                       helper->name, helper->l3proto, helper->l4proto);
+}
+
+static int nftnl_obj_ct_helper_snprintf(char *buf, size_t len, uint32_t type,
+                                      uint32_t flags,
+                                      const struct nftnl_obj *e)
+{
+       switch (type) {
+       case NFTNL_OUTPUT_DEFAULT:
+               return nftnl_obj_ct_helper_snprintf_default(buf, len, e);
+       case NFTNL_OUTPUT_JSON:
+               return nftnl_obj_ct_helper_export(buf, len, e, type);
+       default:
+               break;
+       }
+       return -1;
+}
+
+struct obj_ops obj_ops_ct_helper = {
+       .name           = "ct_helper",
+       .type           = NFT_OBJECT_CT_HELPER,
+       .alloc_len      = sizeof(struct nftnl_obj_ct_helper),
+       .max_attr       = NFTA_CT_HELPER_MAX,
+       .set            = nftnl_obj_ct_helper_set,
+       .get            = nftnl_obj_ct_helper_get,
+       .parse          = nftnl_obj_ct_helper_parse,
+       .build          = nftnl_obj_ct_helper_build,
+       .snprintf       = nftnl_obj_ct_helper_snprintf,
+       .json_parse     = nftnl_obj_quota_json_parse,
+};
index e635f6a8ff0e64921533d18a3f3d2035542cc979..e1a5ac4757b67e23fbb75fd9980751a770f2bcd6 100644 (file)
 static struct obj_ops *obj_ops[] = {
        [NFT_OBJECT_COUNTER]    = &obj_ops_counter,
        [NFT_OBJECT_QUOTA]      = &obj_ops_quota,
+       [NFT_OBJECT_CT_HELPER]  = &obj_ops_ct_helper,
 };
 
 static struct obj_ops *nftnl_obj_ops_lookup(uint32_t type)
 {
-       if (type > NFT_OBJECT_QUOTA)
+       if (type > NFT_OBJECT_CT_HELPER)
                return NULL;
 
        return obj_ops[type];