Remove src_flags and running_src_flags from fw3_zone struct, rename dst_flags and...

[project/firewall3.git] / redirects.c

diff --git a/redirects.c b/redirects.c
index 2aa6664..23dc034 100644 (file)
--- a/redirects.c
+++ b/redirects.c
@@ -20,6 +20,8 @@
 
 
 const struct fw3_option fw3_redirect_opts[] = {
+       FW3_OPT("enabled",             bool,      redirect,     enabled),
+
        FW3_OPT("name",                string,    redirect,     name),
        FW3_OPT("family",              family,    redirect,     family),
 
@@ -131,10 +133,17 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
                INIT_LIST_HEAD(&redir->proto);
                INIT_LIST_HEAD(&redir->mac_src);
 
+               redir->enabled = true;
                redir->reflection = true;
 
                fw3_parse_options(redir, fw3_redirect_opts, s);
 
+               if (!redir->enabled)
+               {
+                       fw3_free_redirect(redir);
+                       continue;
+               }
+
                if (redir->src.invert)
                {
                        warn_elem(e, "must not have an inverted source");
@@ -194,16 +203,16 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
                                warn_elem(e, "has no source specified");
                        else
                        {
-                               setbit(redir->_src->dst_flags, redir->target);
+                               setbit(redir->_src->flags, redir->target);
                                redir->_src->conntrack = true;
                                valid = true;
                        }
 
                        if (redir->reflection && redir->_dest && redir->_src->masq)
                        {
-                               setbit(redir->_dest->dst_flags, FW3_TARGET_ACCEPT);
-                               setbit(redir->_dest->dst_flags, FW3_TARGET_DNAT);
-                               setbit(redir->_dest->dst_flags, FW3_TARGET_SNAT);
+                               setbit(redir->_dest->flags, FW3_TARGET_ACCEPT);
+                               setbit(redir->_dest->flags, FW3_TARGET_DNAT);
+                               setbit(redir->_dest->flags, FW3_TARGET_SNAT);
                        }
                }
                else
@@ -216,7 +225,7 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
                                warn_elem(e, "has no src_dip option specified");
                        else
                        {
-                               setbit(redir->_dest->dst_flags, redir->target);
+                               setbit(redir->_dest->flags, redir->target);
                                redir->_dest->conntrack = true;
                                valid = true;
                        }