projects / project / odhcpd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix illegal memory access
[project/odhcpd.git] / src / config.c
diff --git a/src/config.c b/src/config.c
index bc85603..5d29173 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -15,6 +15,7 @@ struct config config = {false, NULL, NULL};
 enum {
        IFACE_ATTR_INTERFACE,
        IFACE_ATTR_IFNAME,
+       IFACE_ATTR_NETWORKID,
        IFACE_ATTR_DYNAMICDHCP,
        IFACE_ATTR_IGNORE,
        IFACE_ATTR_LEASETIME,
@@ -25,7 +26,7 @@ enum {
        IFACE_ATTR_RA,
        IFACE_ATTR_DHCPV4,
        IFACE_ATTR_DHCPV6,
-       IFACE_ATTR_NDPROXY,
+       IFACE_ATTR_NDP,
        IFACE_ATTR_DNS,
        IFACE_ATTR_DOMAIN,
        IFACE_ATTR_ULA_COMPAT,
@@ -42,6 +43,7 @@ enum {
 static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_NETWORKID] = { .name = "networkid", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DYNAMICDHCP] = { .name = "dynamicdhcp", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_IGNORE] = { .name = "ignore", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_LEASETIME] = { .name = "leasetime", .type = BLOBMSG_TYPE_STRING },
@@ -52,7 +54,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_RA] = { .name = "ra", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DHCPV4] = { .name = "dhcpv4", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DHCPV6] = { .name = "dhcpv6", .type = BLOBMSG_TYPE_STRING },
-       [IFACE_ATTR_NDPROXY] = { .name = "ndproxy", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_NDP] = { .name = "ndp", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
        [IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY },
        [IFACE_ATTR_ULA_COMPAT] = { .name = "ula_compat", .type = BLOBMSG_TYPE_BOOL },
@@ -252,21 +254,23 @@ err:
 }
 
 
-int config_parse_interface(struct blob_attr *b, const char *name)
+int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
 {
-       bool overwrite = !!name;
        struct blob_attr *tb[IFACE_ATTR_MAX], *c;
-       blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(b), blob_len(b));
+       blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, data, len);
 
        if (tb[IFACE_ATTR_INTERFACE])
-               name = blobmsg_data(tb[IFACE_ATTR_INTERFACE]);
+               name = blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]);
+
+       if (!name)
+               return -1;
 
        struct interface *iface = get_interface(name);
        if (!iface) {
                iface = calloc(1, sizeof(*iface));
                strncpy(iface->name, name, sizeof(iface->name) - 1);
                list_add(&iface->head, &interfaces);
-       } else {
+       } else if (overwrite) {
                clean_interface(iface);
        }
 
@@ -277,8 +281,15 @@ int config_parse_interface(struct blob_attr *b, const char *name)
 #endif
        if ((c = tb[IFACE_ATTR_IFNAME]))
                ifname = blobmsg_get_string(c);
+       else if ((c = tb[IFACE_ATTR_NETWORKID]))
+               ifname = blobmsg_get_string(c);
+
+       if (!iface->ifname[0] && !ifname)
+               return -1;
+
+       if (ifname)
+               strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
-       strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
        iface->inuse = true;
 
        if (overwrite)
@@ -328,7 +339,7 @@ int config_parse_interface(struct blob_attr *b, const char *name)
 
        if ((c = tb[IFACE_ATTR_UPSTREAM])) {
                struct blob_attr *cur;
-               int rem;
+               unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
@@ -341,25 +352,40 @@ int config_parse_interface(struct blob_attr *b, const char *name)
                }
        }
 
-       if ((c = tb[IFACE_ATTR_RA]))
-               if ((iface->ra = parse_mode(blobmsg_get_string(c))) < 0)
+       int mode;
+       if ((c = tb[IFACE_ATTR_RA])) {
+               if ((mode = parse_mode(blobmsg_get_string(c))) >= 0)
+                       iface->ra = mode;
+               else
                        goto err;
+       }
 
-       if ((c = tb[IFACE_ATTR_DHCPV4]))
-               if ((iface->dhcpv4 = parse_mode(blobmsg_get_string(c))) < 0)
+       if ((c = tb[IFACE_ATTR_DHCPV4])) {
+               if ((mode = parse_mode(blobmsg_get_string(c))) >= 0)
+                       iface->dhcpv4 = mode;
+               else
                        goto err;
+       }
 
-       if ((c = tb[IFACE_ATTR_DHCPV6]))
-               if ((iface->dhcpv6 = parse_mode(blobmsg_get_string(c))) < 0)
+       if ((c = tb[IFACE_ATTR_DHCPV6])) {
+               if ((mode = parse_mode(blobmsg_get_string(c))) >= 0)
+                       iface->dhcpv6 = mode;
+               else
                        goto err;
+       }
 
-       if ((c = tb[IFACE_ATTR_NDPROXY]))
-               iface->ndp = blobmsg_get_bool(c) ? RELAYD_RELAY : RELAYD_DISABLED;
+       if ((c = tb[IFACE_ATTR_NDP])) {
+               if ((mode = parse_mode(blobmsg_get_string(c))) >= 0)
+                       iface->ndp = mode;
+               else
+                       goto err;
+       }
 
        if ((c = tb[IFACE_ATTR_DNS])) {
                struct blob_attr *cur;
-               int rem;
+               unsigned rem;
 
+               iface->always_rewrite_dns = true;
                blobmsg_for_each_attr(cur, c, rem) {
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
                                continue;
@@ -382,7 +408,7 @@ int config_parse_interface(struct blob_attr *b, const char *name)
 
        if ((c = tb[IFACE_ATTR_DOMAIN])) {
                struct blob_attr *cur;
-               int rem;
+               unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
@@ -432,7 +458,7 @@ int config_parse_interface(struct blob_attr *b, const char *name)
 
        if ((c = tb[IFACE_ATTR_NDPROXY_STATIC])) {
                struct blob_attr *cur;
-               int rem;
+               unsigned rem;
 
                blobmsg_for_each_attr(cur, c, rem) {
                        if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL))
@@ -457,11 +483,11 @@ static int set_interface(struct uci_section *s)
 {
        blob_buf_init(&b, 0);
        uci_to_blob(&b, s, &interface_attr_list);
-       return config_parse_interface(b.head, s->e.name);
+       return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
 }
 
 
-static volatile bool do_reload = false;
+static volatile int do_reload = false;
 static void set_stop(int signal)
 {
        uloop_end();
@@ -475,8 +501,12 @@ void odhcpd_run(void)
        signal(SIGHUP, set_stop);
        signal(SIGINT, set_stop);
 
+#ifdef WITH_UBUS
+       init_ubus();
+#endif
+
        do {
-               do_reload = false;
+               do_reload = uloop_cancelled = false;
 
                struct lease *l;
                list_for_each_entry(l, &leases, head) {
@@ -508,12 +538,17 @@ void odhcpd_run(void)
 #endif
 
                // Evaluate hybrid mode for master
-               struct interface *master = NULL, *i;
+               struct interface *master = NULL, *i, *n;
                list_for_each_entry(i, &interfaces, head) {
                        if (!i->master)
                                continue;
 
                        enum odhcpd_mode hybrid_mode = RELAYD_DISABLED;
+#ifdef WITH_UBUS
+                       if (ubus_has_prefix(i->name, i->ifname))
+                               hybrid_mode = RELAYD_RELAY;
+#endif
+
                        if (i->dhcpv6 == RELAYD_HYBRID)
                                i->dhcpv6 = hybrid_mode;
 
@@ -528,8 +563,8 @@ void odhcpd_run(void)
                }
 
 
-               list_for_each_entry(i, &interfaces, head) {
-                       if (i->inuse && !i->ignore) {
+               list_for_each_entry_safe(i, n, &interfaces, head) {
+                       if (i->inuse) {
                                // Resolve hybrid mode
                                if (i->dhcpv6 == RELAYD_HYBRID)
                                        i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
OpenWrt DHCP Server