X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=defaults.c;h=85a3750a52c6e6bcfc9ee12b424d44ac946f8041;hb=c4309372acc7e1bef8aa230269f7da1dec790e68;hp=3d210f9de5ad8f42101ca98eba1f5682f24454e1;hpb=4e11ee37044dfd09d39054915c23722c48633d60;p=project%2Ffirewall3.git

diff --git a/defaults.c b/defaults.c
index 3d210f9..85a3750 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)
 	{
@@ -108,7 +107,8 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 
-		fw3_parse_options(&state->defaults, fw3_flag_opts, s);
+		if(!fw3_parse_options(&state->defaults, fw3_flag_opts, s))
+			warn_elem(e, "has invalid options");
 
 		check_policy(e, &defs->policy_input, "input");
 		check_policy(e, &defs->policy_output, "output");
@@ -155,7 +155,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);