zones: add interface/subnet bound LOG rules

[project/firewall3.git] / iptables.h

diff --git a/iptables.h b/iptables.h
index 872ee33..8ec7add 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,68 +19,17 @@
 #ifndef __FW3_IPTABLES_H
 #define __FW3_IPTABLES_H
 
-#include <libiptc/libiptc.h>
-#include <libiptc/libip6tc.h>
-#include <xtables.h>
-
-#include <dlfcn.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <sys/utsname.h>
-
-#include "options.h"
-
-/* xtables interface */
-#if (XTABLES_VERSION_CODE == 10)
-# include "xtables-10.h"
-#elif (XTABLES_VERSION_CODE == 5)
-# include "xtables-5.h"
+#ifndef DISABLE_STATIC_EXTENSIONS
+/* libipt*ext.so interfaces */
+extern void init_extensions(void);
+extern void init_extensions4(void);
+extern void init_extensions6(void);
 #else
-# error "Unsupported xtables version"
+static inline void init_extensions(void) { }
+static inline void init_extensions4(void) { }
+static inline void init_extensions6(void) { }
 #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(connlimit)                 \
-       __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;
 void get_kernel_version(void);
@@ -89,28 +38,9 @@ struct fw3_ipt_handle {
        enum fw3_family family;
        enum fw3_table table;
        void *handle;
-
-       int libc;
-       void **libv;
 };
 
-struct fw3_ipt_rule {
-       struct fw3_ipt_handle *h;
-
-       union {
-               struct ipt_entry e;
-               struct ip6t_entry e6;
-       };
-
-       struct xtables_rule_match *matches;
-       struct xtables_target *target;
-
-       int argc;
-       char **argv;
-
-       uint32_t protocol;
-       bool protocol_loaded;
-};
+struct fw3_ipt_rule;
 
 struct fw3_ipt_handle *fw3_ipt_open(enum fw3_family family,
                                     enum fw3_table table);
@@ -122,10 +52,14 @@ void fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
 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);
 
+void fw3_ipt_delete_id_rules(struct fw3_ipt_handle *h, const char *chain);
+
 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_gc(struct fw3_ipt_handle *h);
+
 void fw3_ipt_commit(struct fw3_ipt_handle *h);
 
 void fw3_ipt_close(struct fw3_ipt_handle *h);
@@ -153,6 +87,8 @@ 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_setmatch *match);
 
+void fw3_ipt_rule_helper(struct fw3_ipt_rule *r, struct fw3_cthelpermatch *match);
+
 void fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time);
 
 void fw3_ipt_rule_mark(struct fw3_ipt_rule *r, struct fw3_mark *mark);