From 1524134b0bc013bf8facd62295dd537197d95230 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 30 Aug 2018 19:18:42 +0200 Subject: src: osf: load pf.os from expr_evaluate_osf() Remove osf_init variable and call nfnl_osf_load_fingerprints() from expr_evaluate_osf() instead of doing that from do_command_add() path. Signed-off-by: Fernando Fernandez Mancera Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 68abdc34..e6d61b67 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1394,7 +1394,6 @@ static int do_add_set(struct netlink_ctx *ctx, const struct cmd *cmd, static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl) { uint32_t flags = excl ? NLM_F_EXCL : 0; - int err; if (ctx->octx->echo) { int ret; @@ -1413,10 +1412,7 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl) case CMD_OBJ_CHAIN: return netlink_add_chain_batch(ctx, cmd, flags); case CMD_OBJ_RULE: - err = netlink_add_rule_batch(ctx, cmd, flags | NLM_F_APPEND); - if (osf_init) - nfnl_osf_load_fingerprints(ctx, 0); - return err; + return netlink_add_rule_batch(ctx, cmd, flags | NLM_F_APPEND); case CMD_OBJ_SET: return do_add_set(ctx, cmd, flags); case CMD_OBJ_SETELEM: -- cgit v1.2.3