X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=defaults.c;h=8afbf9acf8323071c7ba4f59666987eb76b1a9d7;hb=e751cde8954a09ea32f67a8bf7974b4dc1395f2e;hp=e246949b5a0ee2b2c16ff753f355dfa25e0250df;hpb=8957be6c026858fe414aef69281d8aa06f7ea122;p=project%2Ffirewall3.git

diff --git a/defaults.c b/defaults.c
index e246949..8afbf9a 100644
--- a/defaults.c
+++ b/defaults.c
@@ -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
@@ -93,7 +93,6 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
 	defs->tcp_syncookies       = true;
 	defs->tcp_window_scaling   = true;
 	defs->custom_chains        = true;
-	defs->drop_invalid         = true;
 
 	uci_foreach_element(&p->sections, e)
 	{
@@ -155,7 +154,7 @@ fw3_print_default_chains(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			continue;
 
 		if (c->flag &&
-		    !hasbit(defs->flags[handle->family == FW3_FAMILY_V6], c->flag))
+		    !fw3_hasbit(defs->flags[handle->family == FW3_FAMILY_V6], c->flag))
 			continue;
 
 		fw3_ipt_create_chain(handle, c->format);
@@ -164,13 +163,6 @@ fw3_print_default_chains(struct fw3_ipt_handle *handle, struct fw3_state *state,
 	set(defs->flags, handle->family, handle->table);
 }
 
-
-struct toplevel_rule {
-	enum fw3_table table;
-	const char *chain;
-	const char *target;
-};
-
 void
 fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
                              struct fw3_state *state, bool reload)