]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
ebtables-compat: load mark target
authorFlorian Westphal <fw@strlen.de>
Tue, 10 Apr 2018 10:53:38 +0000 (12:53 +0200)
committerFlorian Westphal <fw@strlen.de>
Wed, 11 Apr 2018 08:19:50 +0000 (10:19 +0200)
Its already there but it did not work because it wasn't loaded.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
iptables/xtables-eb.c

index 33f7851e9e5a68fab9fbd9975b7f4b8cd36444b0..596894fdc00042523020c623dac288aa5d5a4a7a 100644 (file)
@@ -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,