bridge: Allow setting multicast_router option

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index dd2823d..4a8db70 100644 (file)
--- a/device.c
+++ b/device.c
@@ -34,6 +34,7 @@ static bool default_ps = true;
 static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
        [DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_MTU6] = { .name = "mtu6", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
        [DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
@@ -46,6 +47,9 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_NEIGHREACHABLETIME] = { .name = "neighreachabletime", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_RPS] = { .name = "rps", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_XPS] = { .name = "xps", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 },
+       [DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -154,6 +158,7 @@ device_merge_settings(struct device *dev, struct device_settings *n)
 
        memset(n, 0, sizeof(*n));
        n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+       n->mtu6 = s->flags & DEV_OPT_MTU6 ? s->mtu6 : os->mtu6;
        n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
                s->txqueuelen : os->txqueuelen;
        memcpy(n->macaddr,
@@ -168,7 +173,11 @@ device_merge_settings(struct device *dev, struct device_settings *n)
        n->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
                s->neigh4reachabletime : os->neigh4reachabletime;
        n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
-                       s->neigh6reachabletime : os->neigh6reachabletime;
+               s->neigh6reachabletime : os->neigh6reachabletime;
+       n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
+               s->dadtransmits : os->dadtransmits;
+       n->multicast_to_unicast = s->multicast_to_unicast;
+       n->multicast_router = s->multicast_router;
        n->flags = s->flags | os->flags;
 }
 
@@ -189,6 +198,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_MTU;
        }
 
+       if ((cur = tb[DEV_ATTR_MTU6])) {
+               s->mtu6 = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_MTU6;
+       }
+
        if ((cur = tb[DEV_ATTR_TXQUEUELEN])) {
                s->txqueuelen = blobmsg_get_u32(cur);
                s->flags |= DEV_OPT_TXQUEUELEN;
@@ -259,6 +273,24 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        else
                s->xps = default_ps;
 
+       if ((cur = tb[DEV_ATTR_DADTRANSMITS])) {
+               s->dadtransmits = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_DADTRANSMITS;
+       }
+
+       if ((cur = tb[DEV_ATTR_MULTICAST_TO_UNICAST])) {
+               s->multicast_to_unicast = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_MULTICAST_TO_UNICAST;
+       }
+
+       if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) {
+               s->multicast_router = blobmsg_get_u32(cur);
+               if (s->multicast_router <= 2)
+                       s->flags |= DEV_OPT_MULTICAST_ROUTER;
+               else
+                       DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
+       }
+
        device_set_disabled(dev, disabled);
 }
 
@@ -395,6 +427,8 @@ device_create_default(const char *name, bool external)
        dev->set_state = simple_device_set_state;
        device_init(dev, &simple_device_type, name);
        dev->default_config = true;
+       if (external)
+               system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
        return dev;
 }
 
@@ -517,19 +551,11 @@ static int device_refcount(struct device *dev)
        return count;
 }
 
-void device_add_user(struct device_user *dep, struct device *dev)
+static void
+__device_add_user(struct device_user *dep, struct device *dev)
 {
        struct safe_list *head;
 
-       if (dep->dev == dev)
-               return;
-
-       if (dep->dev)
-               device_remove_user(dep);
-
-       if (!dev)
-               return;
-
        dep->dev = dev;
 
        if (dep->alias)
@@ -550,6 +576,20 @@ void device_add_user(struct device_user *dep, struct device *dev)
        }
 }
 
+void device_add_user(struct device_user *dep, struct device *dev)
+{
+       if (dep->dev == dev)
+               return;
+
+       if (dep->dev)
+               device_remove_user(dep);
+
+       if (!dev)
+               return;
+
+       __device_add_user(dep, dev);
+}
+
 void
 device_free(struct device *dev)
 {
@@ -685,21 +725,19 @@ static void
 device_replace(struct device *dev, struct device *odev)
 {
        struct device_user *dep, *tmp;
-       bool present = odev->present;
 
-       if (present)
+       __devlock++;
+       if (odev->present)
                device_set_present(odev, false);
 
        list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
                device_release(dep);
                safe_list_del(&dep->list);
-               safe_list_add(&dep->list, &dev->users);
-               dep->dev = dev;
+               __device_add_user(dep, dev);
        }
-       device_free(odev);
+       __devlock--;
 
-       if (present)
-               device_set_present(dev, true);
+       device_free(odev);
 }
 
 void
@@ -724,6 +762,9 @@ device_reset_old(void)
                        continue;
 
                ndev = device_create_default(dev->ifname, dev->external);
+               if (!ndev)
+                       continue;
+
                device_replace(ndev, dev);
        }
 }
@@ -843,6 +884,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                device_merge_settings(dev, &st);
                if (st.flags & DEV_OPT_MTU)
                        blobmsg_add_u32(b, "mtu", st.mtu);
+               if (st.flags & DEV_OPT_MTU6)
+                       blobmsg_add_u32(b, "mtu6", st.mtu6);
                if (st.flags & DEV_OPT_MACADDR)
                        blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
                if (st.flags & DEV_OPT_TXQUEUELEN)
@@ -863,6 +906,12 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
                        blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
                }
+               if (st.flags & DEV_OPT_DADTRANSMITS)
+                       blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
+               if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)
+                       blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast);
+               if (st.flags & DEV_OPT_MULTICAST_ROUTER)
+                       blobmsg_add_u32(b, "multicast_router", st.multicast_router);
        }
 
        s = blobmsg_open_table(b, "statistics");