zones: fix emitting match rules for zones with only "extra" options

[project/firewall3.git] / zones.c

diff --git a/zones.c b/zones.c
index e00d527a114904cabe634c02382de4a0d123f591..01fb706dd6dc5613dfebfd4859c3d71d557ab94b 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -98,7 +98,6 @@ const struct fw3_option fw3_zone_opts[] = {
        { }
 };
 
-
 static void
 check_policy(struct uci_element *e, enum fw3_flag *pol, enum fw3_flag def,
              const char *name)
@@ -427,6 +426,37 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
        {
                for (t = FW3_FLAG_ACCEPT; t <= FW3_FLAG_DROP; t++)
                {
+                       if (t > FW3_FLAG_ACCEPT && zone->log & FW3_ZONE_LOG_FILTER)
+                       {
+                               if (has(zone->flags, handle->family, fw3_to_src_target(t)))
+                               {
+                                       r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
+
+                                       snprintf(buf, sizeof(buf) - 1, "%s %s in: ",
+                                                fw3_flag_names[t], zone->name);
+
+                                       fw3_ipt_rule_limit(r, &zone->log_limit);
+                                       fw3_ipt_rule_target(r, "LOG");
+                                       fw3_ipt_rule_addarg(r, false, "--log-prefix", buf);
+                                       fw3_ipt_rule_replace(r, "zone_%s_src_%s",
+                                                            zone->name, fw3_flag_names[t]);
+                               }
+
+                               if (has(zone->flags, handle->family, t))
+                               {
+                                       r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub);
+
+                                       snprintf(buf, sizeof(buf) - 1, "%s %s out: ",
+                                                fw3_flag_names[t], zone->name);
+
+                                       fw3_ipt_rule_limit(r, &zone->log_limit);
+                                       fw3_ipt_rule_target(r, "LOG");
+                                       fw3_ipt_rule_addarg(r, false, "--log-prefix", buf);
+                                       fw3_ipt_rule_replace(r, "zone_%s_dest_%s",
+                                                            zone->name, fw3_flag_names[t]);
+                               }
+                       }
+
                        if (has(zone->flags, handle->family, fw3_to_src_target(t)))
                        {
                                r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
@@ -503,7 +533,7 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                {
                        if (zone->log & FW3_ZONE_LOG_MANGLE)
                        {
-                               snprintf(buf, sizeof(buf) - 1, "MSSFIX(%s): ", zone->name);
+                               snprintf(buf, sizeof(buf) - 1, "MSSFIX %s out: ", zone->name);
 
                                r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub);
                                fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST");
@@ -526,22 +556,27 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
        }
        else if (handle->table == FW3_TABLE_RAW)
        {
+               bool loopback_dev = (dev != NULL && !dev->any &&
+                                    !dev->invert && fw3_check_loopback_dev(dev->name));
+               char *chain = loopback_dev || (sub != NULL && !sub->invert && fw3_check_loopback_addr(sub)) ?
+                             "OUTPUT" : "PREROUTING";
+
                if (has(zone->flags, handle->family, FW3_FLAG_HELPER))
                {
-                       r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
+                       r = fw3_ipt_rule_create(handle, NULL, loopback_dev ? NULL : dev, NULL, sub, NULL);
                        fw3_ipt_rule_comment(r, "%s CT helper assignment", zone->name);
                        fw3_ipt_rule_target(r, "zone_%s_helper", zone->name);
                        fw3_ipt_rule_extra(r, zone->extra_src);
-                       fw3_ipt_rule_replace(r, "PREROUTING");
+                       fw3_ipt_rule_replace(r, chain);
                }
 
                if (has(zone->flags, handle->family, FW3_FLAG_NOTRACK))
                {
-                       r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
+                       r = fw3_ipt_rule_create(handle, NULL, loopback_dev ? NULL : dev, NULL, sub, NULL);
                        fw3_ipt_rule_comment(r, "%s CT bypass", zone->name);
                        fw3_ipt_rule_target(r, "zone_%s_notrack", zone->name);
                        fw3_ipt_rule_extra(r, zone->extra_src);
-                       fw3_ipt_rule_replace(r, "PREROUTING");
+                       fw3_ipt_rule_replace(r, chain);
                }
        }
 }
@@ -559,7 +594,7 @@ print_interface_rules(struct fw3_ipt_handle *handle, struct fw3_state *state,
                if (!fw3_is_family(sub, handle->family))
                        continue;
 
-               if (!dev && !sub)
+               if (!dev && !sub && !zone->extra_src && !zone->extra_dest)
                        continue;
 
                print_interface_rule(handle, state, reload, zone, dev, sub);
@@ -593,9 +628,6 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
        struct fw3_address *mdest;
        struct fw3_ipt_rule *r;
 
-       enum fw3_flag t;
-       char buf[32];
-
        if (!fw3_is_family(zone, handle->family))
                return;
 
@@ -634,39 +666,6 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                                     fw3_flag_names[zone->policy_output]);
                fw3_ipt_rule_append(r, "zone_%s_output", zone->name);
 
-               if (zone->log & FW3_ZONE_LOG_FILTER)
-               {
-                       for (t = FW3_FLAG_REJECT; t <= FW3_FLAG_DROP; t++)
-                       {
-                               if (has(zone->flags, handle->family, fw3_to_src_target(t)))
-                               {
-                                       r = fw3_ipt_rule_new(handle);
-
-                                       snprintf(buf, sizeof(buf) - 1, "%s(src %s)",
-                                                fw3_flag_names[t], zone->name);
-
-                                       fw3_ipt_rule_limit(r, &zone->log_limit);
-                                       fw3_ipt_rule_target(r, "LOG");
-                                       fw3_ipt_rule_addarg(r, false, "--log-prefix", buf);
-                                       fw3_ipt_rule_append(r, "zone_%s_src_%s",
-                                                           zone->name, fw3_flag_names[t]);
-                               }
-
-                               if (has(zone->flags, handle->family, t))
-                               {
-                                       r = fw3_ipt_rule_new(handle);
-
-                                       snprintf(buf, sizeof(buf) - 1, "%s(dest %s)",
-                                                fw3_flag_names[t], zone->name);
-
-                                       fw3_ipt_rule_limit(r, &zone->log_limit);
-                                       fw3_ipt_rule_target(r, "LOG");
-                                       fw3_ipt_rule_addarg(r, false, "--log-prefix", buf);
-                                       fw3_ipt_rule_append(r, "zone_%s_dest_%s",
-                                                           zone->name, fw3_flag_names[t]);
-                               }
-                       }
-               }
                break;
 
        case FW3_TABLE_NAT: