src: add nft_*_list_foreach

This patch adds a simplied iterator interface.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h
index 3645eaad4ba09d3142435b4b378200dfe4917e19..313c26ada51a39cf5931e5a77398f0de3f70ef16 100644 (file)
--- a/include/libnftables/chain.h
+++ b/include/libnftables/chain.h
@@ -63,6 +63,7 @@ struct nft_chain_list;
 
 struct nft_chain_list *nft_chain_list_alloc(void);
 void nft_chain_list_free(struct nft_chain_list *list);
+int nft_chain_list_foreach(struct nft_chain_list *chain_list, int (*cb)(struct nft_chain *t, void *data), void *data);
 
 void nft_chain_list_add(struct nft_chain *r, struct nft_chain_list *list);
 void nft_chain_list_del(struct nft_chain *r);

diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h
index 9989f19b10cb83dbe546f423f8011163292f9b1b..ce8bd1f3d5cc8de9863ad6f69ba79e412fb81a89 100644 (file)
--- a/include/libnftables/rule.h
+++ b/include/libnftables/rule.h
@@ -56,6 +56,10 @@ int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type,
 struct nlmsghdr *nft_rule_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
 int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *t);
 
+int nft_rule_expr_foreach(struct nft_rule *r,
+                         int (*cb)(struct nft_rule_expr *e, void *data),
+                         void *data);
+
 struct nft_rule_expr_iter;
 
 struct nft_rule_expr_iter *nft_rule_expr_iter_create(struct nft_rule *r);
@@ -67,6 +71,7 @@ struct nft_rule_list;
 struct nft_rule_list *nft_rule_list_alloc(void);
 void nft_rule_list_free(struct nft_rule_list *list);
 void nft_rule_list_add(struct nft_rule *r, struct nft_rule_list *list);
+int nft_rule_list_foreach(struct nft_rule_list *rule_list, int (*cb)(struct nft_rule *t, void *data), void *data);
 
 struct nft_rule_list_iter;
 

diff --git a/include/libnftables/set.h b/include/libnftables/set.h
index d1f6d163f7f48cb413909ed951541d99ffc77b0e..f337f604ebda8ff77d2196540426e90bd6c2e1bc 100644 (file)
--- a/include/libnftables/set.h
+++ b/include/libnftables/set.h
@@ -37,6 +37,7 @@ struct nft_set_list;
 struct nft_set_list *nft_set_list_alloc(void);
 void nft_set_list_free(struct nft_set_list *list);
 void nft_set_list_add(struct nft_set *s, struct nft_set_list *list);
+int nft_set_list_foreach(struct nft_set_list *set_list, int (*cb)(struct nft_set *t, void *data), void *data);
 
 struct nft_set_list_iter;
 struct nft_set_list_iter *nft_set_list_iter_create(struct nft_set_list *l);
@@ -80,6 +81,8 @@ int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set_elem *s)
 
 int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *s, uint32_t type, uint32_t flags);
 
+int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set_elem *e, void *data), void *data);
+
 struct nft_set_elems_iter;
 struct nft_set_elems_iter *nft_set_elems_iter_create(struct nft_set *s);
 struct nft_set_elem *nft_set_elems_iter_cur(struct nft_set_elems_iter *iter);

diff --git a/include/libnftables/table.h b/include/libnftables/table.h
index a999770a85babfeddf9f9cfa61e2137da81e810d..8a4778f0f8585c34421b8e596852020e06234684 100644 (file)
--- a/include/libnftables/table.h
+++ b/include/libnftables/table.h
@@ -51,6 +51,7 @@ struct nft_table_list;
 
 struct nft_table_list *nft_table_list_alloc(void);
 void nft_table_list_free(struct nft_table_list *list);
+int nft_table_list_foreach(struct nft_table_list *table_list, int (*cb)(struct nft_table *t, void *data), void *data);
 
 void nft_table_list_add(struct nft_table *r, struct nft_table_list *list);
 

diff --git a/src/chain.c b/src/chain.c
index 1c53daa9152f8c505cdd7e7dfb499d5b052a9041..62a6ddd2a524ade7b139fb51c24b992af14201c3 100644 (file)
--- a/src/chain.c
+++ b/src/chain.c
@@ -801,6 +801,22 @@ void nft_chain_list_del(struct nft_chain *r)
 }
 EXPORT_SYMBOL(nft_chain_list_del);
 
+int nft_chain_list_foreach(struct nft_chain_list *chain_list,
+                          int (*cb)(struct nft_chain *r, void *data),
+                          void *data)
+{
+       struct nft_chain *cur, *tmp;
+       int ret;
+
+       list_for_each_entry_safe(cur, tmp, &chain_list->list, head) {
+               ret = cb(cur, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(nft_chain_list_foreach);
+
 struct nft_chain_list_iter {
        struct nft_chain_list   *list;
        struct nft_chain        *cur;

diff --git a/src/libnftables.map b/src/libnftables.map
index 2b31d5515389bf7eb1ec152e32d2fc637f48523d..6ee7a36a9e353adedc21aba0f7089dbb719038c7 100644 (file)
--- a/src/libnftables.map
+++ b/src/libnftables.map
@@ -16,6 +16,7 @@ global:
   nft_table_nlmsg_parse;
   nft_table_list_alloc;
   nft_table_list_free;
+  nft_table_list_foreach;
   nft_table_list_add;
   nft_table_list_iter_create;
   nft_table_list_iter_next;
@@ -43,6 +44,7 @@ global:
   nft_chain_list_free;
   nft_chain_list_add;
   nft_chain_list_del;
+  nft_chain_list_foreach;
   nft_chain_list_iter_create;
   nft_chain_list_iter_next;
   nft_chain_list_iter_destroy;
@@ -66,6 +68,7 @@ global:
   nft_rule_nlmsg_parse;
   nft_rule_add_expr;
 
+  nft_rule_expr_foreach;
   nft_rule_expr_iter_create;
   nft_rule_expr_iter_next;
   nft_rule_expr_iter_destroy;
@@ -87,6 +90,7 @@ global:
   nft_rule_list_alloc;
   nft_rule_list_free;
   nft_rule_list_add;
+  nft_rule_list_foreach;
   nft_rule_list_iter_create;
   nft_rule_list_iter_cur;
   nft_rule_list_iter_next;
@@ -109,6 +113,7 @@ global:
   nft_set_list_alloc;
   nft_set_list_free;
   nft_set_list_add;
+  nft_set_list_foreach;
 
   nft_set_list_iter_create;
   nft_set_list_iter_cur;
@@ -118,6 +123,7 @@ global:
   nft_set_elem_alloc;
   nft_set_elem_free;
   nft_set_elem_add;
+  nft_set_elem_foreach;
   nft_set_elem_attr_unset;
   nft_set_elem_attr_set;
   nft_set_elem_attr_set_u32;
@@ -133,6 +139,8 @@ global:
   nft_set_elems_nlmsg_build_payload;
   nft_set_elems_nlmsg_parse;
 
+  nft_set_elems_foreach;
+
   nft_set_elems_iter_create;
   nft_set_elems_iter_cur;
   nft_set_elems_iter_next;

diff --git a/src/rule.c b/src/rule.c
index 4c1672de3d2d8269480ce91b7f7b9007fac131b2..13b5a1169cb9ad7fe6bcbe01e36dcdbb42696ac6 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -742,6 +742,22 @@ int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *r,
 }
 EXPORT_SYMBOL(nft_rule_snprintf);
 
+int nft_rule_expr_foreach(struct nft_rule *r,
+                          int (*cb)(struct nft_rule_expr *e, void *data),
+                          void *data)
+{
+       struct nft_rule_expr *cur, *tmp;
+       int ret;
+
+       list_for_each_entry_safe(cur, tmp, &r->expr_list, head) {
+               ret = cb(cur, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(nft_rule_expr_foreach);
+
 struct nft_rule_expr_iter {
        struct nft_rule         *r;
        struct nft_rule_expr    *cur;
@@ -817,6 +833,22 @@ void nft_rule_list_add(struct nft_rule *r, struct nft_rule_list *list)
 }
 EXPORT_SYMBOL(nft_rule_list_add);
 
+int nft_rule_list_foreach(struct nft_rule_list *rule_list,
+                         int (*cb)(struct nft_rule *r, void *data),
+                         void *data)
+{
+       struct nft_rule *cur, *tmp;
+       int ret;
+
+       list_for_each_entry_safe(cur, tmp, &rule_list->list, head) {
+               ret = cb(cur, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(nft_rule_list_foreach);
+
 struct nft_rule_list_iter {
        struct nft_rule_list    *list;
        struct nft_rule         *cur;

diff --git a/src/set.c b/src/set.c
index 8e8adadb1636141253be9c38e48c25840749b62c..4d160623b1fe363e209f570f4d76b4c96ccaa98b 100644 (file)
--- a/src/set.c
+++ b/src/set.c
@@ -364,6 +364,21 @@ void nft_set_list_add(struct nft_set *s, struct nft_set_list *list)
 }
 EXPORT_SYMBOL(nft_set_list_add);
 
+int nft_set_list_foreach(struct nft_set_list *set_list,
+                        int (*cb)(struct nft_set *t, void *data), void *data)
+{
+       struct nft_set *cur, *tmp;
+       int ret;
+
+       list_for_each_entry_safe(cur, tmp, &set_list->list, head) {
+               ret = cb(cur, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(nft_set_list_foreach);
+
 struct nft_set_list_iter {
        struct nft_set_list     *list;
        struct nft_set          *cur;

diff --git a/src/set_elem.c b/src/set_elem.c
index dae1f8c7227f47b332ef9076a99f1ad6028ac312..209227f45dcb6881f29f1d367120fed4b9830f2f 100644 (file)
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -396,6 +396,22 @@ int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *e,
 }
 EXPORT_SYMBOL(nft_set_elem_snprintf);
 
+int nft_set_elem_foreach(struct nft_set *s,
+                        int (*cb)(struct nft_set_elem *e, void *data),
+                        void *data)
+{
+       struct nft_set_elem *elem;
+       int ret;
+
+       list_for_each_entry(elem, &s->element_list, head) {
+               ret = cb(elem, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(nft_set_elem_foreach);
+
 struct nft_set_elems_iter {
        struct list_head                *list;
        struct nft_set_elem             *cur;

diff --git a/src/table.c b/src/table.c
index f21a6ed78c84353c9ecb78a37b01804128966627..3e8d4c91873f00ba6cb52ac046eafa7cf4f66946 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -409,6 +409,22 @@ void nft_table_list_add(struct nft_table *r, struct nft_table_list *list)
 }
 EXPORT_SYMBOL(nft_table_list_add);
 
+int nft_table_list_foreach(struct nft_table_list *table_list,
+                          int (*cb)(struct nft_table *t, void *data),
+                          void *data)
+{
+       struct nft_table *cur, *tmp;
+       int ret;
+
+       list_for_each_entry_safe(cur, tmp, &table_list->list, head) {
+               ret = cb(cur, data);
+               if (ret < 0)
+                       return ret;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(nft_table_list_foreach);
+
 struct nft_table_list_iter {
        struct nft_table_list   *list;
        struct nft_table        *cur;