global: remove automatic notrack rules

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index f45de6e..8f232d3 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -110,9 +110,12 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p,
 
        blob_for_each_attr(entry, a, rem) {
                const char *type = NULL;
+               const char *name = "ubus rule";
                blobmsg_for_each_attr(opt, entry, orem)
                        if (!strcmp(blobmsg_name(opt), "type"))
                                type = blobmsg_get_string(opt);
+                       else if (!strcmp(blobmsg_name(opt), "name"))
+                               name = blobmsg_get_string(opt);
 
                if (!type || strcmp(type, "rule"))
                        continue;
@@ -120,9 +123,9 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p,
                if (!(rule = alloc_rule(state)))
                        continue;
 
-               if (!fw3_parse_blob_options(rule, fw3_rule_opts, entry))
+               if (!fw3_parse_blob_options(rule, fw3_rule_opts, entry, name))
                {
-                       fprintf(stderr, "ubus section skipped due to invalid options\n");
+                       fprintf(stderr, "%s skipped due to invalid options\n", name);
                        fw3_free_rule(rule);
                        continue;
                }
@@ -244,13 +247,13 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p,
                /* NB: rule family... */
                if (rule->_dest)
                {
-                       setbit(rule->_dest->flags[0], rule->target);
-                       setbit(rule->_dest->flags[1], rule->target);
+                       fw3_setbit(rule->_dest->flags[0], rule->target);
+                       fw3_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));
+                       fw3_setbit(rule->_src->flags[0], fw3_to_src_target(rule->target));
+                       fw3_setbit(rule->_src->flags[1], fw3_to_src_target(rule->target));
                }
        }
 }
@@ -261,15 +264,15 @@ append_chain(struct fw3_ipt_rule *r, struct fw3_rule *rule)
 {
        char chain[32];
 
-       snprintf(chain, sizeof(chain), "delegate_output");
+       snprintf(chain, sizeof(chain), "OUTPUT");
 
        if (rule->target == FW3_FLAG_NOTRACK)
        {
                snprintf(chain, sizeof(chain), "zone_%s_notrack", rule->src.name);
        }
-       else if (rule->target == FW3_FLAG_MARK)
+       else if (rule->target == FW3_FLAG_MARK && (rule->_src || rule->src.any))
        {
-               snprintf(chain, sizeof(chain), "fwmark");
+               snprintf(chain, sizeof(chain), "PREROUTING");
        }
        else
        {
@@ -287,16 +290,16 @@ append_chain(struct fw3_ipt_rule *r, struct fw3_rule *rule)
                        else
                        {
                                if (rule->dest.set)
-                                       snprintf(chain, sizeof(chain), "delegate_forward");
+                                       snprintf(chain, sizeof(chain), "FORWARD");
                                else
-                                       snprintf(chain, sizeof(chain), "delegate_input");
+                                       snprintf(chain, sizeof(chain), "INPUT");
                        }
                }
 
                if (rule->dest.set && !rule->src.set)
                {
                        if (rule->dest.any)
-                               snprintf(chain, sizeof(chain), "delegate_output");
+                               snprintf(chain, sizeof(chain), "OUTPUT");
                        else
                                snprintf(chain, sizeof(chain), "zone_%s_output",
                                         rule->dest.name);