X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=forwards.c;h=e27e4ee4c4dabbc9961dd2a4e5261f3e889871d5;hp=6ea0497698a3a84349668fe375fadb882a8d5251;hb=adf87f3a36328b949ed777068b14d975b429f9ad;hpb=d59395113fbe28061b575c6f1fae7d2569f5ff0c

diff --git a/forwards.c b/forwards.c
index 6ea0497..e27e4ee 100644
--- a/forwards.c
+++ b/forwards.c
@@ -48,13 +48,10 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
 		if (strcmp(s->type, "forwarding"))
 			continue;
 
-		forward = malloc(sizeof(*forward));
-
+		forward = calloc(1, sizeof(*forward));
 		if (!forward)
 			continue;
 
-		memset(forward, 0, sizeof(*forward));
-
 		forward->enabled = true;
 
 		fw3_parse_options(forward, fw3_forward_opts, s);
@@ -106,32 +103,32 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
 
 
 static void
-print_chain(struct fw3_forward *forward)
+append_chain(struct fw3_ipt_rule *r, struct fw3_forward *forward)
 {
 	if (forward->src.any || !forward->src.set)
-		fw3_pr("-A delegate_forward");
+		fw3_ipt_rule_append(r, "delegate_forward");
 	else
-		fw3_pr("-A zone_%s_forward", forward->src.name);
+		fw3_ipt_rule_append(r, "zone_%s_forward", forward->src.name);
 }
 
-static void print_target(struct fw3_forward *forward)
+static void set_target(struct fw3_ipt_rule *r, struct fw3_forward *forward)
 {
 	if (forward->dest.any || !forward->dest.set)
-		fw3_pr(" -j ACCEPT\n");
+		fw3_ipt_rule_target(r, "ACCEPT");
 	else
-		fw3_pr(" -j zone_%s_dest_ACCEPT\n", forward->dest.name);
+		fw3_ipt_rule_target(r, "zone_%s_dest_ACCEPT", forward->dest.name);
 }
 
 static void
-print_forward(struct fw3_forward *forward, enum fw3_family family,
-              enum fw3_table table)
+print_forward(struct fw3_ipt_handle *handle, struct fw3_forward *forward)
 {
 	const char *s, *d;
+	struct fw3_ipt_rule *r;
 
-	if (table != FW3_TABLE_FILTER)
+	if (handle->table != FW3_TABLE_FILTER)
 		return;
 
-	if (!fw3_is_family(forward, family))
+	if (!fw3_is_family(forward, handle->family))
 		return;
 
 	s = forward->_src  ? forward->_src->name  : "*";
@@ -139,24 +136,24 @@ print_forward(struct fw3_forward *forward, enum fw3_family family,
 
 	info("   * Forward '%s' -> '%s'", s, d);
 
-	if (!fw3_is_family(forward->_src, family) ||
-	    !fw3_is_family(forward->_dest, family))
+	if (!fw3_is_family(forward->_src, handle->family) ||
+	    !fw3_is_family(forward->_dest, handle->family))
 	{
 		info("     ! Skipping due to different family of zone");
 		return;
 	}
 
-	print_chain(forward);
-	fw3_format_comment("forwarding ", s, "->", d);
-	print_target(forward);
+	r = fw3_ipt_rule_new(handle);
+	fw3_ipt_rule_comment(r, "forwarding %s -> %s", s, d);
+	set_target(r, forward);
+	append_chain(r, forward);
 }
 
 void
-fw3_print_forwards(struct fw3_state *state, enum fw3_family family,
-                   enum fw3_table table)
+fw3_print_forwards(struct fw3_ipt_handle *handle, struct fw3_state *state)
 {
 	struct fw3_forward *forward;
 
 	list_for_each_entry(forward, &state->forwards, list)
-		print_forward(forward, family, table);
+		print_forward(handle, forward);
 }