diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-07-08 05:07:23 +0530 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-07-17 14:26:30 +0200 |
| commit | e0146fa254496dc12187053cd0cd6e5d20eb6a43 (patch) | |
| tree | e41f1d9b9ae20849fe281cf14c97e817c194b68a /src/evaluate.c | |
| parent | f63405f9203ce7a8464d585ad49ea67fb2c0bb3f (diff) | |
include: Pass nf_sock where needed as parameter
This socket should not be global, it is also hidden in many layers of
code. Expose it as function parameters to decouple the netlink socket
handling logic from the command parsing, evaluation and bytecode
generation.
Joint work with Varsha Rao.
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index ca8b63b7..74a40974 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -181,7 +181,7 @@ static int expr_evaluate_symbol(struct eval_ctx *ctx, struct expr **expr) new = expr_clone(sym->expr); break; case SYMBOL_SET: - ret = cache_update(ctx->cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, ctx->cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -2950,13 +2950,13 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd) switch (cmd->obj) { case CMD_OBJ_SETELEM: - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; return setelem_evaluate(ctx, &cmd->expr); case CMD_OBJ_SET: - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -2966,7 +2966,7 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd) handle_merge(&cmd->rule->handle, &cmd->handle); return rule_evaluate(ctx, cmd->rule); case CMD_OBJ_CHAIN: - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -2988,7 +2988,7 @@ static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) switch (cmd->obj) { case CMD_OBJ_SETELEM: - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -3030,7 +3030,7 @@ static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd) struct set *set; int ret; - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -3113,7 +3113,7 @@ static int cmd_evaluate_reset(struct eval_ctx *ctx, struct cmd *cmd) { int ret; - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -3139,7 +3139,7 @@ static int cmd_evaluate_flush(struct eval_ctx *ctx, struct cmd *cmd) struct set *set; int ret; - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -3197,7 +3197,7 @@ static int cmd_evaluate_rename(struct eval_ctx *ctx, struct cmd *cmd) switch (cmd->obj) { case CMD_OBJ_CHAIN: - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -3283,7 +3283,7 @@ static int cmd_evaluate_monitor(struct eval_ctx *ctx, struct cmd *cmd) uint32_t event; int ret; - ret = cache_update(cmd->op, ctx->msgs); + ret = cache_update(ctx->nf_sock, cmd->op, ctx->msgs); if (ret < 0) return ret; @@ -3306,7 +3306,7 @@ static int cmd_evaluate_monitor(struct eval_ctx *ctx, struct cmd *cmd) static int cmd_evaluate_export(struct eval_ctx *ctx, struct cmd *cmd) { - return cache_update(cmd->op, ctx->msgs); + return cache_update(ctx->nf_sock, cmd->op, ctx->msgs); } #ifdef DEBUG |