nft: Keep nft_handle pointer in nft_xt_ctx

Instead of carrying the family value, carry the handle (which contains
the family value) and relieve expression parsers from having to call
nft_family_ops_lookup().

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
index bdbd3238b28900e0ef404ee121c3efd66b69f0e8..80d4e1fcdcea131947320f7997c278e5da7e5a35 100644 (file)
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
@@ -310,7 +310,6 @@ static void nft_parse_target(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
        struct xtables_target *target;
        struct xt_entry_target *t;
        size_t size;
-       struct nft_family_ops *ops;
        void *data = ctx->cs;
 
        target = xtables_find_target(targname, XTF_TRY_LOAD);
@@ -327,8 +326,7 @@ static void nft_parse_target(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
 
        target->t = t;
 
-       ops = nft_family_ops_lookup(ctx->family);
-       ops->parse_target(target, data);
+       ctx->h->ops->parse_target(target, data);
 }
 
 static void nft_parse_match(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
@@ -339,9 +337,8 @@ static void nft_parse_match(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
        struct xtables_match *match;
        struct xtables_rule_match **matches;
        struct xt_entry_match *m;
-       struct nft_family_ops *ops;
 
-       switch (ctx->family) {
+       switch (ctx->h->family) {
        case NFPROTO_IPV4:
        case NFPROTO_IPV6:
        case NFPROTO_BRIDGE:
@@ -349,7 +346,7 @@ static void nft_parse_match(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
                break;
        default:
                fprintf(stderr, "BUG: nft_parse_match() unknown family %d\n",
-                       ctx->family);
+                       ctx->h->family);
                exit(EXIT_FAILURE);
        }
 
@@ -365,9 +362,8 @@ static void nft_parse_match(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
 
        match->m = m;
 
-       ops = nft_family_ops_lookup(ctx->family);
-       if (ops->parse_match != NULL)
-               ops->parse_match(match, ctx->cs);
+       if (ctx->h->ops->parse_match != NULL)
+               ctx->h->ops->parse_match(match, ctx->cs);
 }
 
 void print_proto(uint16_t proto, int invert)
@@ -400,7 +396,6 @@ void get_cmp_data(struct nftnl_expr *e, void *data, size_t dlen, bool *inv)
 
 static void nft_meta_set_to_target(struct nft_xt_ctx *ctx)
 {
-       const struct nft_family_ops *ops;
        struct xtables_target *target;
        struct xt_entry_target *t;
        unsigned int size;
@@ -429,8 +424,7 @@ static void nft_meta_set_to_target(struct nft_xt_ctx *ctx)
 
        target->t = t;
 
-       ops = nft_family_ops_lookup(ctx->family);
-       ops->parse_target(target, ctx->cs);
+       ctx->h->ops->parse_target(target, ctx->cs);
 }
 
 static void nft_parse_meta(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
@@ -474,7 +468,6 @@ static void nft_parse_bitwise(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
 
 static void nft_parse_cmp(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
 {
-       struct nft_family_ops *ops = nft_family_ops_lookup(ctx->family);
        void *data = ctx->cs;
        uint32_t reg;
 
@@ -483,12 +476,12 @@ static void nft_parse_cmp(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
                return;
 
        if (ctx->flags & NFT_XT_CTX_META) {
-               ops->parse_meta(ctx, e, data);
+               ctx->h->ops->parse_meta(ctx, e, data);
                ctx->flags &= ~NFT_XT_CTX_META;
        }
        /* bitwise context is interpreted from payload */
        if (ctx->flags & NFT_XT_CTX_PAYLOAD) {
-               ops->parse_payload(ctx, e, data);
+               ctx->h->ops->parse_payload(ctx, e, data);
                ctx->flags &= ~NFT_XT_CTX_PAYLOAD;
        }
 }
@@ -502,7 +495,6 @@ static void nft_parse_counter(struct nftnl_expr *e, struct xt_counters *counters
 static void nft_parse_immediate(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
 {
        const char *chain = nftnl_expr_get_str(e, NFTNL_EXPR_IMM_CHAIN);
-       struct nft_family_ops *ops;
        const char *jumpto = NULL;
        bool nft_goto = false;
        void *data = ctx->cs;
@@ -544,8 +536,7 @@ static void nft_parse_immediate(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
                break;
        }
 
-       ops = nft_family_ops_lookup(ctx->family);
-       ops->parse_immediate(jumpto, nft_goto, data);
+       ctx->h->ops->parse_immediate(jumpto, nft_goto, data);
 }
 
 static void nft_parse_limit(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
@@ -555,11 +546,10 @@ static void nft_parse_limit(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
        __u64 rate = nftnl_expr_get_u64(e, NFTNL_EXPR_LIMIT_RATE);
        struct xtables_rule_match **matches;
        struct xtables_match *match;
-       struct nft_family_ops *ops;
        struct xt_rateinfo *rinfo;
        size_t size;
 
-       switch (ctx->family) {
+       switch (ctx->h->family) {
        case NFPROTO_IPV4:
        case NFPROTO_IPV6:
        case NFPROTO_BRIDGE:
@@ -567,7 +557,7 @@ static void nft_parse_limit(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
                break;
        default:
                fprintf(stderr, "BUG: nft_parse_limit() unknown family %d\n",
-                       ctx->family);
+                       ctx->h->family);
                exit(EXIT_FAILURE);
        }
 
@@ -586,9 +576,8 @@ static void nft_parse_limit(struct nft_xt_ctx *ctx, struct nftnl_expr *e)
        rinfo->avg = XT_LIMIT_SCALE * unit / rate;
        rinfo->burst = burst;
 
-       ops = nft_family_ops_lookup(ctx->family);
-       if (ops->parse_match != NULL)
-               ops->parse_match(match, ctx->cs);
+       if (ctx->h->ops->parse_match != NULL)
+               ctx->h->ops->parse_match(match, ctx->cs);
 }
 
 void nft_rule_to_iptables_command_state(struct nft_handle *h,
@@ -597,10 +586,9 @@ void nft_rule_to_iptables_command_state(struct nft_handle *h,
 {
        struct nftnl_expr_iter *iter;
        struct nftnl_expr *expr;
-       int family = nftnl_rule_get_u32(r, NFTNL_RULE_FAMILY);
        struct nft_xt_ctx ctx = {
                .cs = cs,
-               .family = family,
+               .h = h,
        };
 
        iter = nftnl_expr_iter_create(r);

diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h
index a85d5442c71075b6834451ebb9afab8f71ee39d6..e79323c882f4d620a465ac985cd9ee994f3d5c13 100644 (file)
--- a/iptables/nft-shared.h
+++ b/iptables/nft-shared.h
@@ -48,7 +48,7 @@ enum {
 struct nft_xt_ctx {
        struct iptables_command_state *cs;
        struct nftnl_expr_iter *iter;
-       int family;
+       struct nft_handle *h;
        uint32_t flags;
 
        uint32_t reg;