wireless: fix handling config reload with reconf=1

[project/netifd.git] / iprule.c

diff --git a/iprule.c b/iprule.c
index d3f607332bd54c7d3233907c2f3c4f30a039fd47..095607373f417a7036441d17ab3c650a7d6a143a 100644 (file)
--- a/iprule.c
+++ b/iprule.c
@@ -44,6 +44,8 @@ enum {
        RULE_ACTION,
        RULE_GOTO,
        RULE_SUP_PREFIXLEN,
+       RULE_UIDRANGE,
+       RULE_DISABLED,
        __RULE_MAX
 };
 
@@ -58,8 +60,10 @@ static const struct blobmsg_policy rule_attr[__RULE_MAX] = {
        [RULE_FWMARK] = { .name = "mark", .type = BLOBMSG_TYPE_STRING },
        [RULE_LOOKUP] = { .name = "lookup", .type = BLOBMSG_TYPE_STRING },
        [RULE_SUP_PREFIXLEN] = { .name = "suppress_prefixlength", .type = BLOBMSG_TYPE_INT32 },
+       [RULE_UIDRANGE] = { .name = "uidrange", .type = BLOBMSG_TYPE_STRING },
        [RULE_ACTION] = { .name = "action", .type = BLOBMSG_TYPE_STRING },
        [RULE_GOTO]   = { .name = "goto", .type = BLOBMSG_TYPE_INT32 },
+       [RULE_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list rule_attr_list = {
@@ -68,7 +72,9 @@ const struct uci_blob_param_list rule_attr_list = {
 };
 
 /* interface based rules are dynamic. */
-static bool rule_ready(struct iprule *rule) {
+static bool
+rule_ready(struct iprule *rule)
+{
        if (rule->flags & IPRULE_OUT && !rule->out_dev[0])
                return false;
 
@@ -109,10 +115,8 @@ iprule_parse_mark(const char *mark, struct iprule *rule)
 }
 
 /* called on interface changes of the incoming interface */
-static void rule_in_cb(
-               struct interface_user *dep,
-               struct interface *iface,
-               enum interface_event ev)
+static void
+rule_in_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
 {
        struct iprule *rule = container_of(dep, struct iprule, in_iface_user);
 
@@ -120,7 +124,8 @@ static void rule_in_cb(
        case IFEV_UP:
                if (!iface->l3_dev.dev)
                        break;
-               memcpy(rule->in_dev, iface->l3_dev.dev->ifname, sizeof(rule->in_dev));
+
+               strcpy(rule->in_dev, iface->l3_dev.dev->ifname);
                if (rule_ready(rule))
                        system_add_iprule(rule);
                break;
@@ -129,6 +134,7 @@ static void rule_in_cb(
        case IFEV_FREE:
                if (rule_ready(rule))
                        system_del_iprule(rule);
+
                rule->in_dev[0] = 0;
                break;
        default:
@@ -137,10 +143,8 @@ static void rule_in_cb(
 }
 
 /* called on interface changes of the outgoing interface */
-static void rule_out_cb(
-               struct interface_user *dep,
-               struct interface *iface,
-               enum interface_event ev)
+static void
+rule_out_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
 {
        struct iprule *rule = container_of(dep, struct iprule, out_iface_user);
 
@@ -148,7 +152,8 @@ static void rule_out_cb(
        case IFEV_UP:
                if (!iface->l3_dev.dev)
                        break;
-               memcpy(rule->out_dev, iface->l3_dev.dev->ifname, sizeof(rule->out_dev));
+
+               strcpy(rule->out_dev, iface->l3_dev.dev->ifname);
                if (rule_ready(rule))
                        system_add_iprule(rule);
                break;
@@ -157,6 +162,7 @@ static void rule_out_cb(
        case IFEV_FREE:
                if (rule_ready(rule))
                        system_del_iprule(rule);
+
                rule->out_dev[0] = 0;
                break;
        default:
@@ -165,10 +171,9 @@ static void rule_out_cb(
 }
 
 /* called on all interface events */
-static void generic_interface_cb(
-               struct interface_user *dep,
-               struct interface *iface,
-               enum interface_event ev)
+static void
+generic_interface_cb(struct interface_user *dep,
+                       struct interface *iface, enum interface_event ev)
 {
        struct iprule *rule;
 
@@ -180,15 +185,11 @@ static void generic_interface_cb(
                if (rule_ready(rule))
                        continue;
 
-               if (!strcmp(rule->out_iface, iface->name)) {
-                       memcpy(rule->out_dev, iface->l3_dev.dev->ifname, sizeof(rule->out_dev));
+               if ((rule->flags & IPRULE_OUT) && !strcmp(rule->out_iface, iface->name))
                        interface_add_user(&rule->out_iface_user, iface);
-               }
 
-               if (!strcmp(rule->in_iface, iface->name)) {
-                       memcpy(rule->in_dev, iface->l3_dev.dev->ifname, sizeof(rule->in_dev));
+               if ((rule->flags & IPRULE_IN) && !strcmp(rule->in_iface, iface->name))
                        interface_add_user(&rule->in_iface_user, iface);
-               }
        }
 }
 
@@ -206,6 +207,9 @@ iprule_add(struct blob_attr *attr, bool v6)
 
        blobmsg_parse(rule_attr, __RULE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
 
+       if ((cur = tb[RULE_DISABLED]) != NULL && blobmsg_get_bool(cur))
+               return;
+
        rule = calloc(1, sizeof(*rule));
        if (!rule)
                return;
@@ -280,6 +284,18 @@ iprule_add(struct blob_attr *attr, bool v6)
                rule->flags |= IPRULE_SUP_PREFIXLEN;
        }
 
+       if ((cur = tb[RULE_UIDRANGE]) != NULL) {
+               int ret = sscanf(blobmsg_get_string(cur), "%u-%u", &rule->uidrange_start, &rule->uidrange_end);
+
+               if (ret == 1)
+                       rule->uidrange_end = rule->uidrange_start;
+               else if (ret != 2) {
+                       DPRINTF("Failed to parse UID range: %s\n", (char *) blobmsg_data(cur));
+                       goto error;
+               }
+               rule->flags |= IPRULE_UIDRANGE;
+       }
+
        if ((cur = tb[RULE_ACTION]) != NULL) {
                if (!system_resolve_iprule_action(blobmsg_data(cur), &rule->action)) {
                        DPRINTF("Failed to parse rule action: %s\n", (char *) blobmsg_data(cur));
@@ -293,7 +309,7 @@ iprule_add(struct blob_attr *attr, bool v6)
                rule->flags |= IPRULE_GOTO;
        }
 
-       vlist_add(&iprules, &rule->node, &rule->flags);
+       vlist_add(&iprules, &rule->node, rule);
        return;
 
 error:
@@ -323,7 +339,32 @@ iprule_update_complete(void)
 static int
 rule_cmp(const void *k1, const void *k2, void *ptr)
 {
-       return memcmp(k1, k2, sizeof(struct iprule)-offsetof(struct iprule, flags));
+       const struct iprule *r1 = k1, *r2 = k2;
+       int ret;
+
+       /* First compare the interface names */
+       if (r1->flags & IPRULE_IN || r2->flags & IPRULE_IN) {
+               char *str1 = r1->flags & IPRULE_IN ? r1->in_iface : "";
+               char *str2 = r2->flags & IPRULE_IN ? r2->in_iface : "";
+
+               ret = strcmp(str1, str2);
+               if (ret)
+                       return ret;
+       }
+
+       if (r1->flags & IPRULE_OUT || r2->flags & IPRULE_OUT) {
+               char *str1 = r1->flags & IPRULE_OUT ? r1->out_iface : "";
+               char *str2 = r2->flags & IPRULE_OUT ? r2->out_iface : "";
+
+               ret = strcmp(str1, str2);
+               if (ret)
+                       return ret;
+       }
+
+       /* Next compare everything after the flags field */
+       return memcmp(k1 + offsetof(struct iprule, flags),
+                     k2 + offsetof(struct iprule, flags),
+                     sizeof(struct iprule) - offsetof(struct iprule, flags));
 }
 
 static void deregister_interfaces(struct iprule *rule)