Rework match initialization

[project/firewall3.git] / iptables.h

diff --git a/iptables.h b/iptables.h
index 3c52942b0055810604ccc588527eaad57d039024..fabefa8abea870ff0331f29a8da9fb96786aff49 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -39,47 +39,10 @@
 # error "Unsupported xtables version"
 #endif
 
-/* libext.a interface */
-#define FW3_IPT_MODULES                        \
-       __ipt_module(comment)           \
-       __ipt_module(conntrack)         \
-       __ipt_module(icmp)                      \
-       __ipt_module(icmp6)                     \
-       __ipt_module(limit)                     \
-       __ipt_module(mac)                       \
-       __ipt_module(mark)                      \
-       __ipt_module(set)                       \
-       __ipt_module(standard)          \
-       __ipt_module(tcp)                       \
-       __ipt_module(time)                      \
-       __ipt_module(udp)                       \
-       __ipt_module(CT)                        \
-       __ipt_module(DNAT)                      \
-       __ipt_module(LOG)                       \
-       __ipt_module(MARK)                      \
-       __ipt_module(MASQUERADE)        \
-       __ipt_module(NOTRACK)           \
-       __ipt_module(REDIRECT)          \
-       __ipt_module(REJECT)            \
-       __ipt_module(SET)                       \
-       __ipt_module(SNAT)                      \
-       __ipt_module(TCPMSS)
-
-#ifdef DISABLE_IPV6
-#undef __ipt_module
-#define __ipt_module(x) \
-       extern void libxt_##x##_init(void) __attribute__((weak)); \
-       extern void libipt_##x##_init(void) __attribute__((weak));
-#else
-#undef __ipt_module
-#define __ipt_module(x) \
-       extern void libxt_##x##_init(void) __attribute__((weak)); \
-       extern void libipt_##x##_init(void) __attribute__((weak)); \
-       extern void libip6t_##x##_init(void) __attribute__((weak));
-#endif
-
-FW3_IPT_MODULES
-
+/* libipt*ext.so interfaces */
+extern void init_extensions(void);
+extern void init_extensions4(void);
+extern void init_extensions6(void);
 
 /* Required by certain extensions like SNAT and DNAT */
 extern int kernel_version;
@@ -143,6 +106,8 @@ void fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 void fw3_ipt_rule_sport_dport(struct fw3_ipt_rule *r,
                               struct fw3_port *sp, struct fw3_port *dp);
 
+void fw3_ipt_rule_device(struct fw3_ipt_rule *r, const char *device, bool out);
+
 void fw3_ipt_rule_mac(struct fw3_ipt_rule *r, struct fw3_mac *mac);
 
 void fw3_ipt_rule_icmptype(struct fw3_ipt_rule *r, struct fw3_icmptype *icmp);