From patchwork Tue Apr 10 10:53:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 896573 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40L3tW0dYBz9s2Y for ; Tue, 10 Apr 2018 20:53:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751833AbeDJKxW (ORCPT ); Tue, 10 Apr 2018 06:53:22 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:49258 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751767AbeDJKxV (ORCPT ); Tue, 10 Apr 2018 06:53:21 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1f5qts-0006Db-AY; Tue, 10 Apr 2018 12:53:20 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH iptables] ebtables-compat: load mark target Date: Tue, 10 Apr 2018 12:53:38 +0200 Message-Id: <20180410105338.17153-1-fw@strlen.de> X-Mailer: git-send-email 2.16.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Its already there but it did not work because it wasn't loaded. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- iptables/xtables-eb.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index 33f7851e9e5a..596894fdc000 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -623,14 +623,14 @@ static void ebt_load_match(const char *name) xtables_error(OTHER_PROBLEM, "Can't alloc memory"); } -static void ebt_load_watcher(const char *name) +static void __ebt_load_watcher(const char *name, const char *typename) { struct xtables_target *watcher; size_t size; watcher = xtables_find_target(name, XTF_TRY_LOAD); if (!watcher) { - fprintf(stderr, "Unable to load %s watcher\n", name); + fprintf(stderr, "Unable to load %s %s\n", name, typename); return; } @@ -651,6 +651,16 @@ static void ebt_load_watcher(const char *name) xtables_error(OTHER_PROBLEM, "Can't alloc memory"); } +static void ebt_load_watcher(const char *name) +{ + return __ebt_load_watcher(name, "watcher"); +} + +static void ebt_load_target(const char *name) +{ + return __ebt_load_watcher(name, "target"); +} + static void ebt_load_match_extensions(void) { opts = ebt_original_options; @@ -661,6 +671,8 @@ static void ebt_load_match_extensions(void) ebt_load_watcher("log"); ebt_load_watcher("nflog"); + + ebt_load_target("mark"); } static void ebt_add_match(struct xtables_match *m,