device: Support multicast config option

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index a29c981..3404fee 100644 (file)
--- a/device.c
+++ b/device.c
@@ -50,6 +50,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [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 },
+       [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -172,9 +173,11 @@ device_merge_settings(struct device *dev, struct device_settings *n)
                s->neigh6reachabletime : os->neigh6reachabletime;
        n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
                s->dadtransmits : os->dadtransmits;
+       n->multicast = s->flags & DEV_OPT_MULTICAST ?
+               s->multicast : os->multicast;
        n->multicast_to_unicast = s->multicast_to_unicast;
        n->multicast_router = s->multicast_router;
-       n->flags = s->flags | os->flags;
+       n->flags = s->flags | os->flags | os->valid_flags;
 }
 
 void
@@ -287,6 +290,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                        DPRINTF("Invalid value: %d - (Use 0: never, 1: learn, 2: always)\n", blobmsg_get_u32(cur));
        }
 
+       if ((cur = tb[DEV_ATTR_MULTICAST])) {
+               s->multicast = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_MULTICAST;
+       }
+
        device_set_disabled(dev, disabled);
 }
 
@@ -337,6 +345,8 @@ int device_claim(struct device_user *dep)
                device_set_ifindex(dev, system_if_resolve(dev));
                if (!dev->ifindex)
                        ret = -1;
+
+               system_if_get_settings(dev, &dev->orig_settings);
        } else
                ret = dev->set_state(dev, true);
 
@@ -427,6 +437,9 @@ device_create_default(const char *name, bool external)
 
        D(DEVICE, "Create simple device '%s'\n", name);
        dev = calloc(1, sizeof(*dev));
+       if (!dev)
+               return NULL;
+
        dev->external = external;
        dev->set_state = simple_device_set_state;
        device_init(dev, &simple_device_type, name);
@@ -917,6 +930,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        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);
+               if (st.flags & DEV_OPT_MULTICAST)
+                       blobmsg_add_u8(b, "multicast", st.multicast);
        }
 
        s = blobmsg_open_table(b, "statistics");