expr: use __attribute__((constructor)) to register expression

Instead of manual array registration.

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

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index da601f9603f457f7422018946e8f6f61fe04e73f..7ea5376396c7136eb464886c7a3676108c610f37 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -360,3 +360,8 @@ struct expr_ops expr_ops_bitwise = {
        .snprintf       = nft_rule_expr_bitwise_snprintf,
        .xml_parse      = nft_rule_expr_bitwise_xml_parse,
 };
+
+static void __init expr_bitwise(void)
+{
+       nft_expr_ops_register(&expr_ops_bitwise);
+}

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 1e6a51b13de60ed7732d17af8df868d951e2a7b2..53283c1f3a4c14ddf97f1d93d8c48bd651decdd0 100644 (file)
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -356,3 +356,8 @@ struct expr_ops expr_ops_byteorder = {
        .snprintf       = nft_rule_expr_byteorder_snprintf,
        .xml_parse      = nft_rule_expr_byteorder_xml_parse,
 };
+
+static void __init expr_byteorder_init(void)
+{
+       nft_expr_ops_register(&expr_ops_byteorder);
+}

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 3f795bcafe3c4e578049603f4a78dc7f5b51d6ad..f49261f5ace046c72985ab7b39b7d9472fe72a00 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -305,3 +305,7 @@ struct expr_ops expr_ops_cmp = {
        .snprintf       = nft_rule_expr_cmp_snprintf,
        .xml_parse      = nft_rule_expr_cmp_xml_parse,
 };
+static void __init expr_cmp_init(void)
+{
+       nft_expr_ops_register(&expr_ops_cmp);
+}

diff --git a/src/expr/counter.c b/src/expr/counter.c
index 171088d69374155a10d0a44bdfda0446ae840c5b..e32a46ca3028dad935f830d719fd49bb13f473d2 100644 (file)
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -201,3 +201,8 @@ struct expr_ops expr_ops_counter = {
        .snprintf       = nft_rule_expr_counter_snprintf,
        .xml_parse      = nft_rule_expr_counter_xml_parse,
 };
+
+static void __init expr_counter_init(void)
+{
+       nft_expr_ops_register(&expr_ops_counter);
+}

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 655a935f1311dacfed111f6cbe31569238087ea2..8ca2167429228ae6b8c5b497e14784808e929cf8 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -281,3 +281,8 @@ struct expr_ops expr_ops_ct = {
        .snprintf       = nft_rule_expr_ct_snprintf,
        .xml_parse      = nft_rule_expr_ct_xml_parse,
 };
+
+static void __init expr_ct_init(void)
+{
+       nft_expr_ops_register(&expr_ops_ct);
+}

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index eddcd00085151ac3935f6fa425c6d9f284c2c59c..a89d17ba7c4c694ff741998c45b6bd7c6cc42779 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -317,3 +317,8 @@ struct expr_ops expr_ops_exthdr = {
        .snprintf       = nft_rule_expr_exthdr_snprintf,
        .xml_parse      = nft_rule_expr_exthdr_xml_parse,
 };
+
+static void __init expr_exthdr_init(void)
+{
+       nft_expr_ops_register(&expr_ops_exthdr);
+}

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 847d0c467489583f542515733068fca654f734d9..1aa937b98bbde8019452e654d6d9c516db55c532 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -360,3 +360,8 @@ struct expr_ops expr_ops_immediate = {
        .snprintf       = nft_rule_expr_immediate_snprintf,
        .xml_parse      = nft_rule_expr_immediate_xml_parse,
 };
+
+static void __init expr_immediate_init(void)
+{
+       nft_expr_ops_register(&expr_ops_immediate);
+}

diff --git a/src/expr/limit.c b/src/expr/limit.c
index c18ca2a6768bc7a26c174f61ad18531529b5f97f..cce74ce4a9e638ba69a1c40f89fff911dd29a6c2 100644 (file)
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -203,3 +203,8 @@ struct expr_ops expr_ops_limit = {
        .snprintf       = nft_rule_expr_limit_snprintf,
        .xml_parse      = nft_rule_expr_limit_xml_parse,
 };
+
+static void __init expr_limit_init(void)
+{
+       nft_expr_ops_register(&expr_ops_limit);
+}

diff --git a/src/expr/log.c b/src/expr/log.c
index 03be03085e1d64332ab7a22ce2f4a33584d09d6d..94e29088b3952cc09c40b1285087e732b1b54a95 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -274,3 +274,8 @@ struct expr_ops expr_ops_log = {
        .snprintf       = nft_rule_expr_log_snprintf,
        .xml_parse      = nft_rule_expr_log_xml_parse,
 };
+
+static void __init expr_log_init(void)
+{
+       nft_expr_ops_register(&expr_ops_log);
+}

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 9babfd12354b98844195d6149024876c9057c543..9495ab0975812e9f8b441f133fef2d43bf845496 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -261,3 +261,8 @@ struct expr_ops expr_ops_lookup = {
        .snprintf       = nft_rule_expr_lookup_snprintf,
        .xml_parse      = nft_rule_expr_lookup_xml_parse,
 };
+
+static void __init expr_lookup_init(void)
+{
+       nft_expr_ops_register(&expr_ops_lookup);
+}

diff --git a/src/expr/match.c b/src/expr/match.c
index 01d8cef9bfa3c31bbaaa20c8c284fd854ffc069d..8bc28785150ae21db8fe35a85c5fee85a2984227 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -265,3 +265,8 @@ struct expr_ops expr_ops_match = {
        .snprintf       = nft_rule_expr_match_snprintf,
        .xml_parse = nft_rule_expr_match_xml_parse,
 };
+
+static void __init expr_match_init(void)
+{
+       nft_expr_ops_register(&expr_ops_match);
+}

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 3b83a4a73bf653aa3669e538af962feac5187af1..ceb7af250f95512a072328ec43ae7bdcf6cc2aef 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -238,3 +238,8 @@ struct expr_ops expr_ops_meta = {
        .snprintf       = nft_rule_expr_meta_snprintf,
        .xml_parse = nft_rule_expr_meta_xml_parse,
 };
+
+static void __init expr_meta_init(void)
+{
+       nft_expr_ops_register(&expr_ops_meta);
+}

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 66ae40589e0182c5048083715962c76946e178bf..5ba2f4dea538d463eb1457da1428d11875745d5d 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -420,3 +420,8 @@ struct expr_ops expr_ops_nat = {
        .snprintf       = nft_rule_expr_nat_snprintf,
        .xml_parse      = nft_rule_expr_nat_xml_parse,
 };
+
+static void __init expr_nat_init(void)
+{
+       nft_expr_ops_register(&expr_ops_nat);
+}

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 539b15737c29086484a7f923a5f0424a53656d73..7ae356b41a5f4f69cfb83ccb3ce92beb3166869e 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -342,3 +342,8 @@ struct expr_ops expr_ops_payload = {
        .snprintf       = nft_rule_expr_payload_snprintf,
        .xml_parse      = nft_rule_expr_payload_xml_parse,
 };
+
+static void __init expr_payload_init(void)
+{
+       nft_expr_ops_register(&expr_ops_payload);
+}

diff --git a/src/expr/target.c b/src/expr/target.c
index fc24a811a79c7e9e98f71a6ae7f217503fdeae28..15e167bbeb9d88432dd6b4e16980b0dc70b3c12e 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -267,3 +267,8 @@ struct expr_ops expr_ops_target = {
        .snprintf       = nft_rule_expr_target_snprintf,
        .xml_parse      = nft_rule_expr_target_xml_parse,
 };
+
+static void __init expr_target_init(void)
+{
+       nft_expr_ops_register(&expr_ops_target);
+}

diff --git a/src/expr_ops.c b/src/expr_ops.c
index da4c1943556514ef6e7ec094553b7c8afb48e033..d0315a34624a9057937baad5470079399ec21117 100644 (file)
--- a/src/expr_ops.c
+++ b/src/expr_ops.c
@@ -1,51 +1,22 @@
 #include <string.h>
+#include <linux_list.h>
 
 #include "expr_ops.h"
 
-extern struct expr_ops expr_ops_bitwise;
-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_exthdr;
-extern struct expr_ops expr_ops_immediate;
-extern struct expr_ops expr_ops_limit;
-extern struct expr_ops expr_ops_log;
-extern struct expr_ops expr_ops_lookup;
-extern struct expr_ops expr_ops_match;
-extern struct expr_ops expr_ops_meta;
-extern struct expr_ops expr_ops_nat;
-extern struct expr_ops expr_ops_payload;
-extern struct expr_ops expr_ops_target;
+static LIST_HEAD(expr_ops_list);
 
-struct expr_ops *expr_ops[] = {
-       &expr_ops_bitwise,
-       &expr_ops_byteorder,
-       &expr_ops_cmp,
-       &expr_ops_counter,
-       &expr_ops_ct,
-       &expr_ops_exthdr,
-       &expr_ops_immediate,
-       &expr_ops_match,
-       &expr_ops_meta,
-       &expr_ops_nat,
-       &expr_ops_payload,
-       &expr_ops_target,
-       &expr_ops_limit,
-       &expr_ops_log,
-       &expr_ops_lookup,
-       NULL,
-};
+void nft_expr_ops_register(struct expr_ops *ops)
+{
+       list_add_tail(&ops->head, &expr_ops_list);
+}
 
 struct expr_ops *nft_expr_ops_lookup(const char *name)
 {
-       int i = 0;
-
-       while (expr_ops[i] != NULL) {
-               if (strcmp(expr_ops[i]->name, name) == 0)
-                       return expr_ops[i];
+       struct expr_ops *ops;
 
-               i++;
+       list_for_each_entry(ops, &expr_ops_list, head) {
+               if (strcmp(ops->name, name) == 0)
+                       return ops;
        }
 
        return NULL;

diff --git a/src/expr_ops.h b/src/expr_ops.h
index 18edfd142ed8b2ab5e6df2cf327c5aaa38cb1bb6..d8a0b3689cfd9e80e08728535b3f57b3c86a2319 100644 (file)
--- a/src/expr_ops.h
+++ b/src/expr_ops.h
@@ -14,6 +14,8 @@ struct nft_rule_expr;
 #endif
 
 struct expr_ops {
+       struct list_head head;
+
        char    *name;
        size_t  alloc_len;
        int     max_attr;
@@ -25,6 +27,7 @@ struct expr_ops {
        int     (*xml_parse)(struct nft_rule_expr *e, mxml_node_t *tree);
 };
 
+void nft_expr_ops_register(struct expr_ops *ops);
 struct expr_ops *nft_expr_ops_lookup(const char *name);
 
 #endif

diff --git a/src/internal.h b/src/internal.h
index 803dcc487e8b0147cd634e9f5ad3e859fa828bb0..773643be7904b10cad60e0006ad60f94a2231f99 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -78,4 +78,6 @@ struct nft_set_elem {
 
 #define div_round_up(n, d)     (((n) + (d) - 1) / (d))
 
+#define __init __attribute__((constructor))
+
 #endif