netifd: Fix printf calls + function declarations.

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 996ffab..306496c 100644 (file)
--- a/device.c
+++ b/device.c
@@ -58,6 +58,8 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
        [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 },
+       [DEV_ATTR_SENDREDIRECTS] = { .name = "sendredirects", .type = BLOBMSG_TYPE_BOOL },
+       [DEV_ATTR_NEIGHLOCKTIME] = { .name = "neighlocktime", .type = BLOBMSG_TYPE_INT32 },
 };
 
 const struct uci_blob_param_list device_attr_list = {
@@ -216,6 +218,8 @@ device_merge_settings(struct device *dev, struct device_settings *n)
                s->neigh4gcstaletime : os->neigh4gcstaletime;
        n->neigh6gcstaletime = s->flags & DEV_OPT_NEIGHGCSTALETIME ?
                s->neigh6gcstaletime : os->neigh6gcstaletime;
+       n->neigh4locktime = s->flags & DEV_OPT_NEIGHLOCKTIME ?
+               s->neigh4locktime : os->neigh4locktime;
        n->dadtransmits = s->flags & DEV_OPT_DADTRANSMITS ?
                s->dadtransmits : os->dadtransmits;
        n->multicast = s->flags & DEV_OPT_MULTICAST ?
@@ -225,6 +229,8 @@ device_merge_settings(struct device *dev, struct device_settings *n)
        n->multicast_fast_leave = s->multicast_fast_leave;
        n->learning = s->learning;
        n->unicast_flood = s->unicast_flood;
+       n->sendredirects = s->flags & DEV_OPT_SENDREDIRECTS ?
+               s->sendredirects : os->sendredirects;
        n->flags = s->flags | os->flags | os->valid_flags;
 }
 
@@ -240,12 +246,12 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        if ((cur = tb[DEV_ATTR_ENABLED]))
                disabled = !blobmsg_get_bool(cur);
 
-       if ((cur = tb[DEV_ATTR_MTU])) {
+       if ((cur = tb[DEV_ATTR_MTU]) && blobmsg_get_u32(cur) >= 68) {
                s->mtu = blobmsg_get_u32(cur);
                s->flags |= DEV_OPT_MTU;
        }
 
-       if ((cur = tb[DEV_ATTR_MTU6])) {
+       if ((cur = tb[DEV_ATTR_MTU6]) && blobmsg_get_u32(cur) >= 1280) {
                s->mtu6 = blobmsg_get_u32(cur);
                s->flags |= DEV_OPT_MTU6;
        }
@@ -311,6 +317,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_NEIGHGCSTALETIME;
        }
 
+       if ((cur = tb[DEV_ATTR_NEIGHLOCKTIME])) {
+               s->neigh4locktime = blobmsg_get_u32(cur);
+               s->flags |= DEV_OPT_NEIGHLOCKTIME;
+       }
+
        if ((cur = tb[DEV_ATTR_RPS])) {
                s->rps = blobmsg_get_bool(cur);
                s->flags |= DEV_OPT_RPS;
@@ -363,6 +374,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
                s->flags |= DEV_OPT_UNICAST_FLOOD;
        }
 
+       if ((cur = tb[DEV_ATTR_SENDREDIRECTS])) {
+               s->sendredirects = blobmsg_get_bool(cur);
+               s->flags |= DEV_OPT_SENDREDIRECTS;
+       }
+
        device_set_disabled(dev, disabled);
 }
 
@@ -937,7 +953,7 @@ device_create(const char *name, struct device_type *type,
        struct device *odev = NULL, *dev;
        enum dev_change_type change;
 
-       odev = device_get(name, false);
+       odev = device_find(name);
        if (odev) {
                odev->current_config = true;
                change = device_apply_config(odev, type, config);
@@ -1036,6 +1052,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u32(b, "neigh4gcstaletime", st.neigh4gcstaletime);
                        blobmsg_add_u32(b, "neigh6gcstaletime", st.neigh6gcstaletime);
                }
+               if (st.flags & DEV_OPT_NEIGHLOCKTIME)
+                       blobmsg_add_u32(b, "neigh4locktime", st.neigh4locktime);
                if (st.flags & DEV_OPT_DADTRANSMITS)
                        blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
                if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)
@@ -1050,6 +1068,8 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                        blobmsg_add_u8(b, "learning", st.learning);
                if (st.flags & DEV_OPT_UNICAST_FLOOD)
                        blobmsg_add_u8(b, "unicast_flood", st.unicast_flood);
+               if (st.flags & DEV_OPT_SENDREDIRECTS)
+                       blobmsg_add_u8(b, "sendredirects", st.sendredirects);
        }
 
        s = blobmsg_open_table(b, "statistics");