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

diff --git a/forwards.c b/forwards.c
index b7e056f..6ea0497 100644
--- a/forwards.c
+++ b/forwards.c
@@ -72,14 +72,14 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 		else if (forward->src.set && !forward->src.any &&
-		         !(forward->_src = fw3_lookup_zone(state, forward->src.name, false)))
+		         !(forward->_src = fw3_lookup_zone(state, forward->src.name)))
 		{
 			warn_elem(e, "refers to not existing zone '%s'", forward->src.name);
 			fw3_free_forward(forward);
 			continue;
 		}
 		else if (forward->dest.set && !forward->dest.any &&
-		         !(forward->_dest = fw3_lookup_zone(state, forward->dest.name, false)))
+		         !(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);
@@ -89,8 +89,8 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
 		/* NB: forward family... */
 		if (forward->_dest)
 		{
-			setbit(forward->_dest->flags[0], FW3_TARGET_ACCEPT);
-			setbit(forward->_dest->flags[1], FW3_TARGET_ACCEPT);
+			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))
@@ -123,8 +123,8 @@ static void print_target(struct fw3_forward *forward)
 }
 
 static void
-print_forward(enum fw3_table table, enum fw3_family family,
-              struct fw3_forward *forward)
+print_forward(struct fw3_forward *forward, enum fw3_family family,
+              enum fw3_table table)
 {
 	const char *s, *d;
 
@@ -152,11 +152,11 @@ print_forward(enum fw3_table table, enum fw3_family family,
 }
 
 void
-fw3_print_forwards(enum fw3_table table, enum fw3_family family,
-                   struct fw3_state *state)
+fw3_print_forwards(struct fw3_state *state, enum fw3_family family,
+                   enum fw3_table table)
 {
 	struct fw3_forward *forward;
 
 	list_for_each_entry(forward, &state->forwards, list)
-		print_forward(table, family, forward);
+		print_forward(forward, family, table);
 }