netifd: add metric argument for proto_add_ipv4_route

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 54638e7..24c7fe3 100644 (file)
--- a/device.c
+++ b/device.c
@@ -43,6 +43,9 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [DEV_ATTR_ACCEPTLOCAL] = { .name = "acceptlocal", .type = BLOBMSG_TYPE_BOOL },
        [DEV_ATTR_IGMPVERSION] = { .name = "igmpversion", .type = BLOBMSG_TYPE_INT32 },
        [DEV_ATTR_MLDVERSION] = { .name = "mldversion", .type = BLOBMSG_TYPE_INT32 },
+       [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 },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -162,6 +165,10 @@ device_merge_settings(struct device *dev, struct device_settings *n)
        n->acceptlocal = s->flags & DEV_OPT_ACCEPTLOCAL ? s->acceptlocal : os->acceptlocal;
        n->igmpversion = s->flags & DEV_OPT_IGMPVERSION ? s->igmpversion : os->igmpversion;
        n->mldversion = s->flags & DEV_OPT_MLDVERSION ? s->mldversion : os->mldversion;
+       n->neigh4reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+               s->neigh4reachabletime : os->neigh4reachabletime;
+       n->neigh6reachabletime = s->flags & DEV_OPT_NEIGHREACHABLETIME ?
+                       s->neigh6reachabletime : os->neigh6reachabletime;
        n->flags = s->flags | os->flags;
 }
 
@@ -233,6 +240,21 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                        DPRINTF("Failed to resolve mldversion: %d\n", blobmsg_get_u32(cur));
        }
 
+       if ((cur = tb[DEV_ATTR_NEIGHREACHABLETIME])) {
+               s->neigh6reachabletime = s->neigh4reachabletime = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_NEIGHREACHABLETIME;
+       }
+
+       if ((cur = tb[DEV_ATTR_RPS]))
+               s->rps = blobmsg_get_bool(cur);
+       else
+               s->rps = true;
+
+       if ((cur = tb[DEV_ATTR_XPS]))
+               s->xps = blobmsg_get_bool(cur);
+       else
+               s->xps = true;
+
        device_set_disabled(dev, disabled);
 }
 
@@ -349,6 +371,8 @@ int device_init(struct device *dev, const struct device_type *type, const char *
 
        system_if_clear_state(dev);
        device_check_state(dev);
+       dev->settings.rps = true;
+       dev->settings.xps = true;
 
        return 0;
 }
@@ -586,7 +610,7 @@ device_init_pending(void)
        }
 }
 
-enum dev_change_type
+static enum dev_change_type
 device_set_config(struct device *dev, const struct device_type *type,
                  struct blob_attr *attr)
 {
@@ -794,6 +818,10 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u32(b, "igmpversion", st.igmpversion);
                if (st.flags & DEV_OPT_MLDVERSION)
                        blobmsg_add_u32(b, "mldversion", st.mldversion);
+               if (st.flags & DEV_OPT_NEIGHREACHABLETIME) {
+                       blobmsg_add_u32(b, "neigh4reachabletime", st.neigh4reachabletime);
+                       blobmsg_add_u32(b, "neigh6reachabletime", st.neigh6reachabletime);
+               }
        }
 
        s = blobmsg_open_table(b, "statistics");