proto: add an option for specifying external addresses using proto_apply_ip_settings()

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index f5a719a..d47bcdf 100644 (file)
--- a/device.c
+++ b/device.c
@@ -175,18 +175,33 @@ static const struct device_type alias_device_type = {
        .free = alias_device_free,
 };
 
+static void
+device_merge_settings(struct device *dev, struct device_settings *n)
+{
+       struct device_settings *os = &dev->orig_settings;
+       struct device_settings *s = &dev->settings;
+
+       memset(n, 0, sizeof(*n));
+       n->mtu = s->flags & DEV_OPT_MTU ? s->mtu : os->mtu;
+       n->txqueuelen = s->flags & DEV_OPT_TXQUEUELEN ?
+               s->txqueuelen : os->txqueuelen;
+       memcpy(n->macaddr,
+               (s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
+               sizeof(n->macaddr));
+       n->flags = s->flags | os->flags;
+}
+
 void
 device_init_settings(struct device *dev, struct blob_attr **tb)
 {
        struct device_settings *s = &dev->settings;
        struct blob_attr *cur;
        struct ether_addr *ea;
+       bool disabled = false;
 
        s->flags = 0;
-       dev->disabled = false;
-
        if ((cur = tb[DEV_ATTR_ENABLED]))
-               device_set_disabled(dev, !blobmsg_get_bool(cur));
+               disabled = !blobmsg_get_bool(cur);
 
        if ((cur = tb[DEV_ATTR_MTU])) {
                s->mtu = blobmsg_get_u32(cur);
@@ -205,6 +220,8 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                        s->flags |= DEV_OPT_MACADDR;
                }
        }
+
+       device_set_disabled(dev, disabled);
 }
 
 static void __init dev_init(void)
@@ -652,6 +669,7 @@ device_create(const char *name, const struct device_type *type,
 void
 device_dump_status(struct blob_buf *b, struct device *dev)
 {
+       struct device_settings st;
        void *c, *s;
 
        if (!dev) {
@@ -676,6 +694,16 @@ device_dump_status(struct blob_buf *b, struct device *dev)
        else
                system_if_dump_info(dev, b);
 
+       if (dev->active) {
+               device_merge_settings(dev, &st);
+               if (st.flags & DEV_OPT_MTU)
+                       blobmsg_add_u32(b, "mtu", st.mtu);
+               if (st.flags & DEV_OPT_MACADDR)
+                       blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+               if (st.flags & DEV_OPT_TXQUEUELEN)
+                       blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+       }
+
        s = blobmsg_open_table(b, "statistics");
        if (dev->type->dump_stats)
                dev->type->dump_stats(dev, b);