Include iptables command and table name in iptables debug output

[project/firewall3.git] / iptables.h

diff --git a/iptables.h b/iptables.h
index d809c1d..4731104 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -21,23 +21,119 @@
 
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.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"
 
 
 
 #include "options.h"
 
 

+extern struct xtables_match *xtables_pending_matches;
+extern struct xtables_target *xtables_pending_targets;
+
+/* libext.a interface */
+void init_extensions(void);
+void init_extensions4(void);
+void init_extensions6(void);
+
+/* Required by certain extensions like SNAT and DNAT */
+extern int kernel_version;
+void get_kernel_version(void);
+

 struct fw3_ipt_handle {
        enum fw3_family family;
        enum fw3_table table;
        struct xtc_handle *handle;
 };
 
 struct fw3_ipt_handle {
        enum fw3_family family;
        enum fw3_table table;
        struct xtc_handle *handle;
 };
 

-struct fw3_ipt_handle *fw3_ipt_open(enum fw3_family family, enum fw3_table table);
+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_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_set_policy(struct fw3_ipt_handle *h, 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);
 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_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_flush(struct fw3_ipt_handle *h);
 
 void fw3_ipt_commit(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_in_out(struct fw3_ipt_rule *r,
+                         struct fw3_device *in, struct fw3_device *out);
+
+void fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
+                           struct fw3_address *src, struct fw3_address *dest);
+
+void fw3_ipt_rule_sport_dport(struct fw3_ipt_rule *r,
+                              struct fw3_port *sp, struct fw3_port *dp);
+
+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_time(struct fw3_ipt_rule *r, struct fw3_time *time);
+
+void fw3_ipt_rule_mark(struct fw3_ipt_rule *r, struct fw3_mark *mark);
+
+void fw3_ipt_rule_comment(struct fw3_ipt_rule *r, const char *fmt, ...);
+
+void fw3_ipt_rule_extra(struct fw3_ipt_rule *r, const char *extra);
+
+void fw3_ipt_rule_addarg(struct fw3_ipt_rule *r, bool inv,
+                         const char *k, const char *v);
+
+struct fw3_ipt_rule * fw3_ipt_rule_create(struct fw3_ipt_handle *handle,
+                                          struct fw3_protocol *proto,
+                                          struct fw3_device *in,
+                                          struct fw3_device *out,
+                                          struct fw3_address *src,
+                                          struct fw3_address *dest);
+
+void fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...);
+
+static inline void
+fw3_ipt_rule_target(struct fw3_ipt_rule *r, const char *fmt, ...)
+{
+       va_list ap;
+       char buf[32];
+
+       va_start(ap, fmt);
+       vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+       va_end(ap);
+
+       fw3_ipt_rule_addarg(r, false, "-j", buf);
+}
+

 #endif
 #endif