src: limit stateful object support

This patch adds support for a new type of stateful object: limit.

Signed-off-by: Pablo M. Bermudo Garay <pablombg@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/libnftnl/object.h b/include/libnftnl/object.h
index ccd9d19b93645fb81b785d5cd4238e26a63fc358..1c3bc7c7a71ce17849f121131b0a5d89cd80623b 100644 (file)
--- a/include/libnftnl/object.h
+++ b/include/libnftnl/object.h
@@ -40,6 +40,14 @@ enum {
        NFTNL_OBJ_CT_HELPER_L4PROTO,
 };
 
+enum {
+       NFTNL_OBJ_LIMIT_RATE    = NFTNL_OBJ_BASE,
+       NFTNL_OBJ_LIMIT_UNIT,
+       NFTNL_OBJ_LIMIT_BURST,
+       NFTNL_OBJ_LIMIT_TYPE,
+       NFTNL_OBJ_LIMIT_FLAGS,
+};
+
 struct nftnl_obj;
 
 struct nftnl_obj *nftnl_obj_alloc(void);

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 2e174d820190d27b00453962a24471ed05458333..874fa3f239eba6d09d2908273402209d6f61b928 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -1278,7 +1278,8 @@ enum nft_ct_helper_attributes {
 #define NFT_OBJECT_COUNTER     1
 #define NFT_OBJECT_QUOTA       2
 #define NFT_OBJECT_CT_HELPER   3
-#define __NFT_OBJECT_MAX       4
+#define NFT_OBJECT_LIMIT       4
+#define __NFT_OBJECT_MAX       5
 #define NFT_OBJECT_MAX         (__NFT_OBJECT_MAX - 1)
 
 /**

diff --git a/include/obj.h b/include/obj.h
index d90919f2d86b5a92919e2dc860305688db8839dd..d17d63a05fcc3921122db81a3b6d2e6b5e432b3b 100644 (file)
--- a/include/obj.h
+++ b/include/obj.h
@@ -35,6 +35,13 @@ struct nftnl_obj {
                        uint8_t         l4proto;
                        char            name[16];
                } ct_helper;
+               struct nftnl_obj_limit {
+                       uint64_t        rate;
+                       uint64_t        unit;
+                       uint32_t        burst;
+                       uint32_t        type;
+                       uint32_t        flags;
+               } limit;
        } data;
 };
 
@@ -55,6 +62,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;
+extern struct obj_ops obj_ops_limit;
 
 #define nftnl_obj_data(obj) (void *)&obj->data
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 77b67b2676721edc82f652f4a18643dac54600da..59ddf6a249a239bf81caf82e5dfa9eda4e2c21c6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,4 +55,5 @@ libnftnl_la_SOURCES = utils.c         \
                      obj/counter.c     \
                      obj/ct_helper.c   \
                      obj/quota.c       \
+                     obj/limit.c       \
                      libnftnl.map

diff --git a/src/obj/limit.c b/src/obj/limit.c
new file mode 100644 (file)
index 0000000..8cf0faa
--- /dev/null
+++ b/src/obj/limit.c
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2017 Pablo M. Bermudo Garay <pablombg@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 <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_limit_set(struct nftnl_obj *e, uint16_t type,
+                              const void *data, uint32_t data_len)
+{
+       struct nftnl_obj_limit *limit = nftnl_obj_data(e);
+
+       switch (type) {
+       case NFTNL_OBJ_LIMIT_RATE:
+               limit->rate = *((uint64_t *)data);
+               break;
+       case NFTNL_OBJ_LIMIT_UNIT:
+               limit->unit = *((uint64_t *)data);
+               break;
+       case NFTNL_OBJ_LIMIT_BURST:
+               limit->burst = *((uint32_t *)data);
+               break;
+       case NFTNL_OBJ_LIMIT_TYPE:
+               limit->type = *((uint32_t *)data);
+               break;
+       case NFTNL_OBJ_LIMIT_FLAGS:
+               limit->flags = *((uint32_t *)data);
+               break;
+       default:
+               return -1;
+       }
+       return 0;
+}
+
+static const void *nftnl_obj_limit_get(const struct nftnl_obj *e,
+                                      uint16_t type, uint32_t *data_len)
+{
+       struct nftnl_obj_limit *limit = nftnl_obj_data(e);
+
+       switch (type) {
+       case NFTNL_OBJ_LIMIT_RATE:
+               *data_len = sizeof(limit->rate);
+               return &limit->rate;
+       case NFTNL_OBJ_LIMIT_UNIT:
+               *data_len = sizeof(limit->unit);
+               return &limit->unit;
+       case NFTNL_OBJ_LIMIT_BURST:
+               *data_len = sizeof(limit->burst);
+               return &limit->burst;
+       case NFTNL_OBJ_LIMIT_TYPE:
+               *data_len = sizeof(limit->type);
+               return &limit->type;
+       case NFTNL_OBJ_LIMIT_FLAGS:
+               *data_len = sizeof(limit->flags);
+               return &limit->flags;
+       }
+       return NULL;
+}
+
+static int nftnl_obj_limit_cb(const struct nlattr *attr, void *data)
+{
+       int type = mnl_attr_get_type(attr);
+       const struct nlattr **tb = data;
+
+       if (mnl_attr_type_valid(attr, NFTA_LIMIT_MAX) < 0)
+               return MNL_CB_OK;
+
+       switch (type) {
+       case NFTA_LIMIT_RATE:
+       case NFTA_LIMIT_UNIT:
+               if (mnl_attr_validate(attr, MNL_TYPE_U64) < 0)
+                       abi_breakage();
+               break;
+       case NFTA_LIMIT_BURST:
+       case NFTA_LIMIT_TYPE:
+       case NFTA_LIMIT_FLAGS:
+               if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+                       abi_breakage();
+               break;
+       }
+
+       tb[type] = attr;
+       return MNL_CB_OK;
+}
+
+static void nftnl_obj_limit_build(struct nlmsghdr *nlh,
+                                 const struct nftnl_obj *e)
+{
+       struct nftnl_obj_limit *limit = nftnl_obj_data(e);
+
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_RATE))
+               mnl_attr_put_u64(nlh, NFTA_LIMIT_RATE, htobe64(limit->rate));
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_UNIT))
+               mnl_attr_put_u64(nlh, NFTA_LIMIT_UNIT, htobe64(limit->unit));
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_BURST))
+               mnl_attr_put_u32(nlh, NFTA_LIMIT_BURST, htonl(limit->burst));
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_TYPE))
+               mnl_attr_put_u32(nlh, NFTA_LIMIT_TYPE, htonl(limit->type));
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_FLAGS))
+               mnl_attr_put_u32(nlh, NFTA_LIMIT_FLAGS, htonl(limit->flags));
+}
+
+static int nftnl_obj_limit_parse(struct nftnl_obj *e, struct nlattr *attr)
+{
+       struct nftnl_obj_limit *limit = nftnl_obj_data(e);
+       struct nlattr *tb[NFTA_LIMIT_MAX + 1] = {};
+
+       if (mnl_attr_parse_nested(attr, nftnl_obj_limit_cb, tb) < 0)
+               return -1;
+
+       if (tb[NFTA_LIMIT_RATE]) {
+               limit->rate = be64toh(mnl_attr_get_u64(tb[NFTA_LIMIT_RATE]));
+               e->flags |= (1 << NFTNL_OBJ_LIMIT_RATE);
+       }
+       if (tb[NFTA_LIMIT_UNIT]) {
+               limit->unit = be64toh(mnl_attr_get_u64(tb[NFTA_LIMIT_UNIT]));
+               e->flags |= (1 << NFTNL_OBJ_LIMIT_UNIT);
+       }
+       if (tb[NFTA_LIMIT_BURST]) {
+               limit->burst = ntohl(mnl_attr_get_u32(tb[NFTA_LIMIT_BURST]));
+               e->flags |= (1 << NFTNL_OBJ_LIMIT_BURST);
+       }
+       if (tb[NFTA_LIMIT_TYPE]) {
+               limit->type = ntohl(mnl_attr_get_u32(tb[NFTA_LIMIT_TYPE]));
+               e->flags |= (1 << NFTNL_OBJ_LIMIT_TYPE);
+       }
+       if (tb[NFTA_LIMIT_FLAGS]) {
+               limit->flags = ntohl(mnl_attr_get_u32(tb[NFTA_LIMIT_FLAGS]));
+               e->flags |= (1 << NFTNL_OBJ_LIMIT_FLAGS);
+       }
+
+       return 0;
+}
+
+static int nftnl_obj_limit_json_parse(struct nftnl_obj *e, json_t *root,
+                                     struct nftnl_parse_err *err)
+{
+#ifdef JSON_PARSING
+       uint64_t uval64;
+       uint32_t uval32;
+
+       if (nftnl_jansson_parse_val(root, "rate", NFTNL_TYPE_U64, &uval64,
+                                   err) == 0)
+               nftnl_obj_set_u64(e, NFTNL_OBJ_LIMIT_RATE, uval64);
+       if (nftnl_jansson_parse_val(root, "unit", NFTNL_TYPE_U64, &uval64,
+                                   err) == 0)
+               nftnl_obj_set_u64(e, NFTNL_OBJ_LIMIT_UNIT, uval64);
+       if (nftnl_jansson_parse_val(root, "burst", NFTNL_TYPE_U32, &uval32,
+                                   err) == 0)
+               nftnl_obj_set_u32(e, NFTNL_OBJ_LIMIT_BURST, uval32);
+       if (nftnl_jansson_parse_val(root, "type", NFTNL_TYPE_U32, &uval32,
+                                   err) == 0)
+               nftnl_obj_set_u32(e, NFTNL_OBJ_LIMIT_TYPE, uval32);
+       if (nftnl_jansson_parse_val(root, "flags", NFTNL_TYPE_U32, &uval32,
+                                   err) == 0)
+               nftnl_obj_set_u32(e, NFTNL_OBJ_LIMIT_FLAGS, uval32);
+
+       return 0;
+#else
+       errno = EOPNOTSUPP;
+       return -1;
+#endif
+}
+
+static int nftnl_obj_limit_export(char *buf, size_t size,
+                                 const struct nftnl_obj *e, int type)
+{
+       struct nftnl_obj_limit *limit = nftnl_obj_data(e);
+       NFTNL_BUF_INIT(b, buf, size);
+
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_RATE))
+               nftnl_buf_u64(&b, type, limit->rate, RATE);
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_UNIT))
+               nftnl_buf_u64(&b, type, limit->unit, UNIT);
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_BURST))
+               nftnl_buf_u32(&b, type, limit->burst, BURST);
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_TYPE))
+               nftnl_buf_u32(&b, type, limit->type, TYPE);
+       if (e->flags & (1 << NFTNL_OBJ_LIMIT_FLAGS))
+               nftnl_buf_u32(&b, type, limit->flags, FLAGS);
+
+       return nftnl_buf_done(&b);
+}
+
+static int nftnl_obj_limit_snprintf_default(char *buf, size_t len,
+                                           const struct nftnl_obj *e)
+{
+       struct nftnl_obj_limit *limit = nftnl_obj_data(e);
+
+       return snprintf(buf, len, "rate %"PRIu64" unit %"PRIu64" burst %u "
+                       "type %u flags %u ", limit->rate, limit->unit,
+                       limit->burst, limit->type, limit->flags);
+}
+
+static int nftnl_obj_limit_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_limit_snprintf_default(buf, len, e);
+       case NFTNL_OUTPUT_XML:
+       case NFTNL_OUTPUT_JSON:
+               return nftnl_obj_limit_export(buf, len, e, type);
+       default:
+               break;
+       }
+       return -1;
+}
+
+struct obj_ops obj_ops_limit = {
+       .name           = "limit",
+       .type           = NFT_OBJECT_LIMIT,
+       .alloc_len      = sizeof(struct nftnl_obj_limit),
+       .max_attr       = NFTA_LIMIT_MAX,
+       .set            = nftnl_obj_limit_set,
+       .get            = nftnl_obj_limit_get,
+       .parse          = nftnl_obj_limit_parse,
+       .build          = nftnl_obj_limit_build,
+       .snprintf       = nftnl_obj_limit_snprintf,
+       .json_parse     = nftnl_obj_limit_json_parse,
+};

diff --git a/src/object.c b/src/object.c
index e1a5ac4757b67e23fbb75fd9980751a770f2bcd6..9dc5b413c0fcb49f807e8d67f850a7f377e2bb7f 100644 (file)
--- a/src/object.c
+++ b/src/object.c
@@ -29,11 +29,12 @@ 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,
+       [NFT_OBJECT_LIMIT]      = &obj_ops_limit,
 };
 
 static struct obj_ops *nftnl_obj_ops_lookup(uint32_t type)
 {
-       if (type > NFT_OBJECT_CT_HELPER)
+       if (type > NFT_OBJECT_MAX)
                return NULL;
 
        return obj_ops[type];