]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
netlink_delinearize: pass ctx pointer to stmt_reject_postprocess()
authorPablo Neira Ayuso <pablo@netfilter.org>
Sat, 30 May 2015 15:59:18 +0000 (17:59 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sat, 30 May 2015 15:59:18 +0000 (17:59 +0200)
Instead of a copy of the context variable.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/netlink_delinearize.c

index b041579f9277c1278d6fa6a5938e41e3408304ae..26a8c855ed5342eaca12ea76d7ad8765b9a0bf45 100644 (file)
@@ -1082,18 +1082,18 @@ static void expr_postprocess(struct rule_pp_ctx *ctx,
        }
 }
 
-static void stmt_reject_postprocess(struct rule_pp_ctx rctx, struct stmt *stmt)
+static void stmt_reject_postprocess(struct rule_pp_ctx *rctx, struct stmt *stmt)
 {
        const struct proto_desc *desc, *base;
        int protocol;
 
-       switch (rctx.pctx.family) {
+       switch (rctx->pctx.family) {
        case NFPROTO_IPV4:
-               stmt->reject.family = rctx.pctx.family;
+               stmt->reject.family = rctx->pctx.family;
                stmt->reject.expr->dtype = &icmp_code_type;
                break;
        case NFPROTO_IPV6:
-               stmt->reject.family = rctx.pctx.family;
+               stmt->reject.family = rctx->pctx.family;
                stmt->reject.expr->dtype = &icmpv6_code_type;
                break;
        case NFPROTO_INET:
@@ -1101,8 +1101,8 @@ static void stmt_reject_postprocess(struct rule_pp_ctx rctx, struct stmt *stmt)
                        stmt->reject.expr->dtype = &icmpx_code_type;
                        break;
                }
-               base = rctx.pctx.protocol[PROTO_BASE_LL_HDR].desc;
-               desc = rctx.pctx.protocol[PROTO_BASE_NETWORK_HDR].desc;
+               base = rctx->pctx.protocol[PROTO_BASE_LL_HDR].desc;
+               desc = rctx->pctx.protocol[PROTO_BASE_NETWORK_HDR].desc;
                protocol = proto_find_num(base, desc);
                switch (protocol) {
                case NFPROTO_IPV4:
@@ -1119,8 +1119,8 @@ static void stmt_reject_postprocess(struct rule_pp_ctx rctx, struct stmt *stmt)
                        stmt->reject.expr->dtype = &icmpx_code_type;
                        break;
                }
-               base = rctx.pctx.protocol[PROTO_BASE_LL_HDR].desc;
-               desc = rctx.pctx.protocol[PROTO_BASE_NETWORK_HDR].desc;
+               base = rctx->pctx.protocol[PROTO_BASE_LL_HDR].desc;
+               desc = rctx->pctx.protocol[PROTO_BASE_NETWORK_HDR].desc;
                protocol = proto_find_num(base, desc);
                switch (protocol) {
                case __constant_htons(ETH_P_IP):
@@ -1173,7 +1173,7 @@ static void rule_parse_postprocess(struct netlink_parse_ctx *ctx, struct rule *r
                                                 &stmt->redir.proto);
                        break;
                case STMT_REJECT:
-                       stmt_reject_postprocess(rctx, stmt);
+                       stmt_reject_postprocess(&rctx, stmt);
                        break;
                case STMT_SET:
                        expr_postprocess(&rctx, stmt, &stmt->set.key);