Keep all basic chains on reload and only flush them, this allows user rules to jump...

[project/firewall3.git] / iptables.h

diff --git a/iptables.h b/iptables.h
index 31d3268..96d71bf 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -23,20 +23,62 @@
 #include <libiptc/libip6tc.h>
 #include <xtables.h>
 
+#include <dlfcn.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <sys/utsname.h>
 
 #include "options.h"
 
-
-extern struct xtables_match *xtables_pending_matches;
-extern struct xtables_target *xtables_pending_targets;
+/* xtables interface */
+#if (XTABLES_VERSION_CODE == 10)
+# include "xtables-10.h"
+#elif (XTABLES_VERSION_CODE == 5)
+# include "xtables-5.h"
+#else
+# error "Unsupported xtables version"
+#endif
 
 /* libext.a interface */
-void init_extensions(void);
-void init_extensions4(void);
-void init_extensions6(void);
+#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(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
+
 
 /* Required by certain extensions like SNAT and DNAT */
 extern int kernel_version;
@@ -45,7 +87,10 @@ void get_kernel_version(void);
 struct fw3_ipt_handle {
        enum fw3_family family;
        enum fw3_table table;
-       struct xtc_handle *handle;
+       void *handle;
+
+       int libc;
+       void **libv;
 };
 
 struct fw3_ipt_rule {
@@ -72,29 +117,18 @@ struct fw3_ipt_handle *fw3_ipt_open(enum fw3_family family,
 void fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
                         enum fw3_flag policy);
 
-void fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain);
-void fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target);
 
-static inline void
-fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...)
-{
-       char buf[32];
-       va_list ap;
-
-       va_start(ap, fmt);
-       vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-
-       if (fw3_pr_debug)
-               printf("-N %s\n", buf);
+void fw3_ipt_flush_chain(struct fw3_ipt_handle *h, const char *chain);
+void fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain);
 
-       iptc_create_chain(buf, h->handle);
-}
+void fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...);
 
 void fw3_ipt_flush(struct fw3_ipt_handle *h);
 
 void fw3_ipt_commit(struct fw3_ipt_handle *h);
 
+void fw3_ipt_close(struct fw3_ipt_handle *h);
+
 struct fw3_ipt_rule *fw3_ipt_rule_new(struct fw3_ipt_handle *h);
 
 void fw3_ipt_rule_proto(struct fw3_ipt_rule *r, struct fw3_protocol *proto);
@@ -114,8 +148,7 @@ void fw3_ipt_rule_icmptype(struct fw3_ipt_rule *r, struct fw3_icmptype *icmp);
 
 void fw3_ipt_rule_limit(struct fw3_ipt_rule *r, struct fw3_limit *limit);
 
-void fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_ipset *ipset,
-                        bool invert);
+void fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_setmatch *match);
 
 void fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time);
 
@@ -135,7 +168,14 @@ struct fw3_ipt_rule * fw3_ipt_rule_create(struct fw3_ipt_handle *handle,
                                           struct fw3_address *src,
                                           struct fw3_address *dest);
 
-void fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...);
+void __fw3_ipt_rule_append(struct fw3_ipt_rule *r, bool repl,
+                           const char *fmt, ...);
+
+#define fw3_ipt_rule_append(rule, ...) \
+       __fw3_ipt_rule_append(rule, false, __VA_ARGS__)
+
+#define fw3_ipt_rule_replace(rule, ...) \
+       __fw3_ipt_rule_append(rule, true, __VA_ARGS__)
 
 static inline void
 fw3_ipt_rule_target(struct fw3_ipt_rule *r, const char *fmt, ...)