X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=forwards.c;h=b32b529a2337c9143802ed80404909d271f4f352;hp=c7e7ba1874fb2fe2cc51a8682d4fd8c51027f4e5;hb=41c2ab5e5cf62a4c04707145c65d37e27d82d63f;hpb=6b27a6665c288937eb5028063064e3350dcab545

diff --git a/forwards.c b/forwards.c
index c7e7ba1..b32b529 100644
--- a/forwards.c
+++ b/forwards.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
@@ -31,76 +31,112 @@ const struct fw3_option fw3_forward_opts[] = {
 	{ }
 };
 
+static bool
+check_forward(struct fw3_state *state, struct fw3_forward *forward, struct uci_element *e)
+{
+	if (!forward->enabled)
+		return false;
+
+	if (forward->src.invert || forward->dest.invert)
+	{
+		warn_section("forward", forward, e, "must not have inverted 'src' or 'dest' options");
+		return false;
+	}
+	else if (forward->src.set && !forward->src.any &&
+		 !(forward->_src = fw3_lookup_zone(state, forward->src.name)))
+	{
+		warn_section("forward", forward, e, "refers to not existing zone '%s'",
+				forward->src.name);
+		return false;
+	}
+	else if (forward->dest.set && !forward->dest.any &&
+		 !(forward->_dest = fw3_lookup_zone(state, forward->dest.name)))
+	{
+		warn_section("forward", forward, e, "refers to not existing zone '%s'",
+				forward->dest.name);
+		return false;
+	}
+
+	/* NB: forward family... */
+	if (forward->_dest)
+	{
+		fw3_setbit(forward->_dest->flags[0], FW3_FLAG_ACCEPT);
+		fw3_setbit(forward->_dest->flags[1], FW3_FLAG_ACCEPT);
+	}
+
+	return true;
+}
+
+static struct fw3_forward *
+fw3_alloc_forward(struct fw3_state *state)
+{
+	struct fw3_forward *forward;
+
+	forward = calloc(1, sizeof(*forward));
+	if (!forward)
+		return NULL;
+
+	forward->enabled = true;
+
+	list_add_tail(&forward->list, &state->forwards);
+
+	return forward;
+}
 
 void
-fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
+fw3_load_forwards(struct fw3_state *state, struct uci_package *p,
+		struct blob_attr *a)
 {
 	struct uci_section *s;
 	struct uci_element *e;
 	struct fw3_forward *forward;
+	struct blob_attr *entry;
+	unsigned rem;
 
 	INIT_LIST_HEAD(&state->forwards);
 
-	uci_foreach_element(&p->sections, e)
+	blob_for_each_attr(entry, a, rem)
 	{
-		s = uci_to_section(e);
+		const char *type;
+		const char *name = "ubus forward";
 
-		if (strcmp(s->type, "forwarding"))
+		if (!fw3_attr_parse_name_type(entry, &name, &type))
 			continue;
 
-		forward = malloc(sizeof(*forward));
+		if (strcmp(type, "forwarding"))
+			continue;
 
+		forward = fw3_alloc_forward(state);
 		if (!forward)
 			continue;
 
-		memset(forward, 0, sizeof(*forward));
-
-		forward->enabled = true;
-
-		fw3_parse_options(forward, fw3_forward_opts, s);
-
-		if (!forward->enabled)
+		if (!fw3_parse_blob_options(forward, fw3_forward_opts, entry, name))
 		{
+			warn_section("forward", forward, NULL, "skipped due to invalid options");
 			fw3_free_forward(forward);
 			continue;
 		}
 
-		if (forward->src.invert || forward->dest.invert)
-		{
-			warn_elem(e, "must not have inverted 'src' or 'dest' options");
-			fw3_free_forward(forward);
-			continue;
-		}
-		else if (forward->src.set && !forward->src.any &&
-		         !(forward->_src = fw3_lookup_zone(state, forward->src.name)))
-		{
-			warn_elem(e, "refers to not existing zone '%s'", forward->src.name);
+		if (!check_forward(state, forward, NULL))
 			fw3_free_forward(forward);
+	}
+
+	uci_foreach_element(&p->sections, e)
+	{
+		s = uci_to_section(e);
+
+		if (strcmp(s->type, "forwarding"))
 			continue;
-		}
-		else if (forward->dest.set && !forward->dest.any &&
-		         !(forward->_dest = fw3_lookup_zone(state, forward->dest.name)))
-		{
-			warn_elem(e, "refers to not existing zone '%s'", forward->dest.name);
-			fw3_free_forward(forward);
+
+		forward = fw3_alloc_forward(state);
+		if (!forward)
 			continue;
-		}
 
-		/* NB: forward family... */
-		if (forward->_dest)
-		{
-			setbit(forward->_dest->flags[0], FW3_FLAG_ACCEPT);
-			setbit(forward->_dest->flags[1], FW3_FLAG_ACCEPT);
-
-			if (forward->_src &&
-			    (forward->_src->conntrack || forward->_dest->conntrack))
-			{
-				forward->_src->conntrack = forward->_dest->conntrack = true;
-			}
-		}
+		if (!fw3_parse_options(forward, fw3_forward_opts, s))
+			warn_elem(e, "has invalid options");
 
-		list_add_tail(&forward->list, &state->forwards);
-		continue;
+		if (!check_forward(state, forward, e))
+			fw3_free_forward(forward);
 	}
 }
 
@@ -109,7 +145,7 @@ static void
 append_chain(struct fw3_ipt_rule *r, struct fw3_forward *forward)
 {
 	if (forward->src.any || !forward->src.set)
-		fw3_ipt_rule_append(r, "delegate_forward");
+		fw3_ipt_rule_append(r, "FORWARD");
 	else
 		fw3_ipt_rule_append(r, "zone_%s_forward", forward->src.name);
 }