bridge: make learning and unicast-flood configurable per bridge port

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 0d73138..0e07615 100644 (file)
--- a/device.c
+++ b/device.c
@@ -50,6 +50,9 @@ 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 },
+       [DEV_ATTR_LEARNING] = { .name ="learning", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_UNICAST_FLOOD] = { .name ="unicast_flood", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -74,18 +77,14 @@ void device_unlock(void)
 static int set_device_state(struct device *dev, bool state)
 {
        if (state) {
-               /* Set ifindex for all devices being enabled so a valid  */
+               /* Get ifindex for all devices being enabled so a valid  */
                /* ifindex is in place avoiding possible race conditions */
                device_set_ifindex(dev, system_if_resolve(dev));
                if (!dev->ifindex)
                        return -1;
-       }
-
-       if (dev->external)
-               return 0;
 
-       if (state)
                system_if_up(dev);
+       }
        else
                system_if_down(dev);
 
@@ -176,9 +175,13 @@ 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->learning = s->learning;
+       n->unicast_flood = s->unicast_flood;
+       n->flags = s->flags | os->flags | os->valid_flags;
 }
 
 void
@@ -291,6 +294,21 @@ 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;
+       }
+
+       if ((cur = tb[DEV_ATTR_LEARNING])) {
+               s->learning = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_LEARNING;
+       }
+
+       if ((cur = tb[DEV_ATTR_UNICAST_FLOOD])) {
+               s->unicast_flood = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_UNICAST_FLOOD;
+       }
+
        device_set_disabled(dev, disabled);
 }
 
@@ -324,18 +342,31 @@ void device_broadcast_event(struct device *dev, enum device_event ev)
 int device_claim(struct device_user *dep)
 {
        struct device *dev = dep->dev;
-       int ret;
+       int ret = 0;
 
        if (dep->claimed)
                return 0;
 
+       if (!dev)
+               return -1;
+
        dep->claimed = true;
        D(DEVICE, "Claim %s %s, new active count: %d\n", dev->type->name, dev->ifname, dev->active + 1);
        if (++dev->active != 1)
                return 0;
 
        device_broadcast_event(dev, DEV_EVENT_SETUP);
-       ret = dev->set_state(dev, true);
+       if (dev->external) {
+               /* Get ifindex for external claimed devices so a valid   */
+               /* ifindex is in place avoiding possible race conditions */
+               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);
+
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
        else {
@@ -423,6 +454,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);
@@ -704,12 +738,16 @@ device_apply_config(struct device *dev, const struct device_type *type,
                        free(dev->config);
                        dev->config = config;
                        if (change == DEV_CONFIG_RESTART && dev->present) {
+                               int ret = 0;
+
                                device_set_present(dev, false);
                                if (dev->active && !dev->external) {
-                                       dev->set_state(dev, false);
-                                       dev->set_state(dev, true);
+                                       ret = dev->set_state(dev, false);
+                                       if (!ret)
+                                               ret = dev->set_state(dev, true);
                                }
-                               device_set_present(dev, true);
+                               if (!ret)
+                                       device_set_present(dev, true);
                        }
                        break;
                case DEV_CONFIG_NO_CHANGE:
@@ -913,6 +951,12 @@ 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);
+               if (st.flags & DEV_OPT_LEARNING)
+                       blobmsg_add_u8(b, "learning", st.learning);
+               if (st.flags & DEV_OPT_UNICAST_FLOOD)
+                       blobmsg_add_u8(b, "unicast_flood", st.unicast_flood);
        }
 
        s = blobmsg_open_table(b, "statistics");