For ingress rules, only jump into zone_name_src_ACTION chains if the target is not...

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index a251f7c..4750af7 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -63,6 +63,12 @@ const struct fw3_option fw3_rule_opts[] = {
 };
 
 
 };
 
 

+static bool
+need_src_action_chain(struct fw3_rule *r)
+{
+       return (r->_src && r->_src->log && (r->target > FW3_FLAG_ACCEPT));
+}
+

 void
 fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 {
 void
 fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 {


@@ -200,6 +206,11 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
                        setbit(rule->_dest->flags[0], rule->target);
                        setbit(rule->_dest->flags[1], rule->target);
                }
                        setbit(rule->_dest->flags[0], rule->target);
                        setbit(rule->_dest->flags[1], rule->target);
                }

+               else if (need_src_action_chain(rule))
+               {
+                       setbit(rule->_src->flags[0], fw3_to_src_target(rule->target));
+                       setbit(rule->_src->flags[1], fw3_to_src_target(rule->target));
+               }

 
                list_add_tail(&rule->list, &state->rules);
                continue;
 
                list_add_tail(&rule->list, &state->rules);
                continue;


@@ -274,21 +285,24 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
                fw3_ipt_rule_addarg(r, false, name, buf);
                return;
 
                fw3_ipt_rule_addarg(r, false, name, buf);
                return;
 

+       case FW3_FLAG_NOTRACK:
+               fw3_ipt_rule_target(r, fw3_flag_names[rule->target]);
+               return;
+

        case FW3_FLAG_ACCEPT:
        case FW3_FLAG_DROP:
        case FW3_FLAG_ACCEPT:
        case FW3_FLAG_DROP:

-       case FW3_FLAG_NOTRACK:

                name = fw3_flag_names[rule->target];
                break;
 
        default:
                name = fw3_flag_names[rule->target];
                break;
 
        default:

-               name = fw3_flag_names[FW3_FLAG_REJECT];
+               name = "reject";

                break;
        }
 
        if (rule->dest.set && !rule->dest.any)
                fw3_ipt_rule_target(r, "zone_%s_dest_%s", rule->dest.name, name);
                break;
        }
 
        if (rule->dest.set && !rule->dest.any)
                fw3_ipt_rule_target(r, "zone_%s_dest_%s", rule->dest.name, name);

-       else if (rule->target == FW3_FLAG_REJECT)
-               fw3_ipt_rule_target(r, "reject");
+       else if (need_src_action_chain(rule))
+               fw3_ipt_rule_target(r, "zone_%s_src_%s", rule->src.name, name);

        else
                fw3_ipt_rule_target(r, name);
 }
        else
                fw3_ipt_rule_target(r, name);
 }