/*
* 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
#ifndef __FW3_IPTABLES_H
#define __FW3_IPTABLES_H
-#include <libiptc/libiptc.h>
-#include <libiptc/libip6tc.h>
-#include <xtables.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;
-
-/* 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(REDIRECT) \
- __ipt_module(REJECT) \
- __ipt_module(SET) \
- __ipt_module(SNAT) \
- __ipt_module(TCPMSS)
-
-#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));
-
-FW3_IPT_MODULES
-
+#ifndef DISABLE_STATIC_EXTENSIONS
+/* libipt*ext.so interfaces */
+extern void init_extensions(void);
+extern void init_extensions4(void);
+extern void init_extensions6(void);
+#else
+static inline void init_extensions(void) { }
+static inline void init_extensions4(void) { }
+static inline void init_extensions6(void) { }
+#endif
/* Required by certain extensions like SNAT and DNAT */
extern int kernel_version;
struct fw3_ipt_handle {
enum fw3_family family;
enum fw3_table table;
- struct xtc_handle *handle;
+ void *handle;
};
-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);
void fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
enum fw3_flag policy);
+
+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_rules(struct fw3_ipt_handle *h, const char *target);
+
+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);
+
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);
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);
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);
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, ...)