diff options
author | Phil Sutter <phil@nwl.cc> | 2022-06-02 10:53:31 +0200 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2022-06-23 14:22:22 +0200 |
commit | 0124019fb36859a77c32b6f96eeb4cc3e8ebb432 (patch) | |
tree | 251622329723088245945dcac9aece007e6f7077 /extensions | |
parent | 6c12201b5ff08d9e1524477ff63bb8810198d638 (diff) |
libxtables: Move struct xtables_afinfo into xtables.h
The library "owns" this structure and maintains 'afinfo' pointer to
instances of it. With libxt_set, there's even an extension making use of
the data.
To avoid impact on library users, guard it by XTABLES_INTERNAL.
To eliminate the xshared.h include by libxt_set, DEBUGP has to be
redefined. Other extensions have similar defines, fix this later.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/libxt_set.c | 6 | ||||
-rw-r--r-- | extensions/libxt_set.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/extensions/libxt_set.c b/extensions/libxt_set.c index 16921023..a2137ab1 100644 --- a/extensions/libxt_set.c +++ b/extensions/libxt_set.c @@ -22,6 +22,12 @@ #include <linux/netfilter/xt_set.h> #include "libxt_set.h" +#ifdef DEBUG +#define DEBUGP(x, args...) fprintf(stderr, x, ## args) +#else +#define DEBUGP(x, args...) +#endif + /* Revision 0 */ static void diff --git a/extensions/libxt_set.h b/extensions/libxt_set.h index ad895a75..597bf7eb 100644 --- a/extensions/libxt_set.h +++ b/extensions/libxt_set.h @@ -6,7 +6,6 @@ #include <sys/types.h> #include <sys/socket.h> #include <errno.h> -#include "../iptables/xshared.h" static int get_version(unsigned *version) |