device: Support multicast config option
authorHans Dedecker <dedeckeh@gmail.com>
Mon, 1 Feb 2016 09:56:29 +0000 (10:56 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 1 Feb 2016 10:09:58 +0000 (11:09 +0100)
Make multicast device flag configurable by extending device attributes
with the multicast attribute

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Signed-off-by: Nick Podolak <nicholas.podolak@dtechlabs.com>
device.c
device.h
system-linux.c

index 65183f3..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_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 = {
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -172,6 +173,8 @@ 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;
                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 | os->valid_flags;
        n->multicast_to_unicast = s->multicast_to_unicast;
        n->multicast_router = s->multicast_router;
        n->flags = s->flags | os->flags | os->valid_flags;
@@ -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));
        }
 
                        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);
 }
 
        device_set_disabled(dev, disabled);
 }
 
@@ -922,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);
                        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");
        }
 
        s = blobmsg_open_table(b, "statistics");
index a6c131a..ac77cfb 100644 (file)
--- a/device.h
+++ b/device.h
@@ -44,6 +44,7 @@ enum {
        DEV_ATTR_DADTRANSMITS,
        DEV_ATTR_MULTICAST_TO_UNICAST,
        DEV_ATTR_MULTICAST_ROUTER,
        DEV_ATTR_DADTRANSMITS,
        DEV_ATTR_MULTICAST_TO_UNICAST,
        DEV_ATTR_MULTICAST_ROUTER,
+       DEV_ATTR_MULTICAST,
        __DEV_ATTR_MAX,
 };
 
        __DEV_ATTR_MAX,
 };
 
@@ -86,6 +87,7 @@ enum {
        DEV_OPT_DADTRANSMITS            = (1 << 13),
        DEV_OPT_MULTICAST_TO_UNICAST    = (1 << 14),
        DEV_OPT_MULTICAST_ROUTER        = (1 << 15),
        DEV_OPT_DADTRANSMITS            = (1 << 13),
        DEV_OPT_MULTICAST_TO_UNICAST    = (1 << 14),
        DEV_OPT_MULTICAST_ROUTER        = (1 << 15),
+       DEV_OPT_MULTICAST               = (1 << 16),
 };
 
 /* events broadcasted to all users of a device */
 };
 
 /* events broadcasted to all users of a device */
@@ -146,6 +148,7 @@ struct device_settings {
        unsigned int dadtransmits;
        bool multicast_to_unicast;
        unsigned int multicast_router;
        unsigned int dadtransmits;
        bool multicast_to_unicast;
        unsigned int multicast_router;
+       bool multicast;
 };
 
 /*
 };
 
 /*
index 9978ade..86e373c 100644 (file)
@@ -1089,6 +1089,9 @@ system_if_get_settings(struct device *dev, struct device_settings *s)
        if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) == 0) {
                s->promisc = ifr.ifr_flags & IFF_PROMISC;
                s->flags |= DEV_OPT_PROMISC;
        if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) == 0) {
                s->promisc = ifr.ifr_flags & IFF_PROMISC;
                s->flags |= DEV_OPT_PROMISC;
+
+               s->multicast = ifr.ifr_flags & IFF_MULTICAST;
+               s->flags |= DEV_OPT_MULTICAST;
        }
 
        if (!system_get_rpfilter(dev, buf, sizeof(buf))) {
        }
 
        if (!system_get_rpfilter(dev, buf, sizeof(buf))) {
@@ -1219,6 +1222,11 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                snprintf(buf, sizeof(buf), "%d", s->dadtransmits);
                system_set_dadtransmits(dev, buf);
        }
                snprintf(buf, sizeof(buf), "%d", s->dadtransmits);
                system_set_dadtransmits(dev, buf);
        }
+       if (s->flags & DEV_OPT_MULTICAST & apply_mask) {
+               if (system_if_flags(dev->ifname, s->multicast ? IFF_MULTICAST : 0,
+                                   !s->multicast ? IFF_MULTICAST : 0) < 0)
+                       s->flags &= ~DEV_OPT_MULTICAST;
+       }
 
        system_if_apply_rps_xps(dev, s);
 }
 
        system_if_apply_rps_xps(dev, s);
 }