netifd: fix a typo in vlandev hotplug support

[project/netifd.git] / proto-shell.c

diff --git a/proto-shell.c b/proto-shell.c
index 9653f4c8b9b13958d32998b0fa6cece86008d25b..26622165df51daaf8e513df5f3254319a2cfa0d2 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -181,11 +181,6 @@ proto_shell_handler(struct interface_proto_state *proto,
                        state->sm = S_SETUP;
                        break;
 
-               case S_SETUP_ABORT:
-               case S_TEARDOWN:
-               case S_SETUP:
-                       return 0;
-
                default:
                        return -1;
                }
@@ -418,6 +413,23 @@ proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
        }
 }
 
+static void
+proto_shell_parse_neighbor_list(struct interface *iface, struct blob_attr *attr,
+                               bool v6)
+{
+       struct blob_attr *cur;
+       int rem;
+
+       blobmsg_for_each_attr(cur, attr, rem) {
+               if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
+                       DPRINTF("Ignore wrong neighbor type: %d\n", blobmsg_type(cur));
+                       continue;
+               }
+
+               interface_ip_add_neighbor(iface, cur, v6);
+       }
+}
+
 static void
 proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
 {
@@ -461,6 +473,8 @@ enum {
        NOTIFY_HOST,
        NOTIFY_DNS,
        NOTIFY_DNS_SEARCH,
+       NOTIFY_NEIGHBORS,
+       NOTIFY_NEIGHBORS6,
        __NOTIFY_LAST
 };
 
@@ -482,6 +496,8 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
        [NOTIFY_HOST] = { .name = "host", .type = BLOBMSG_TYPE_STRING },
        [NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
        [NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+       [NOTIFY_NEIGHBORS]= {.name = "neighbor", .type = BLOBMSG_TYPE_ARRAY},
+       [NOTIFY_NEIGHBORS6]= {.name = "neighbor6", .type = BLOBMSG_TYPE_ARRAY},
 };
 
 static int
@@ -551,6 +567,12 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
        if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
                proto_shell_parse_route_list(state->proto.iface, cur, true);
 
+       if ((cur = tb[NOTIFY_NEIGHBORS]) != NULL)
+               proto_shell_parse_neighbor_list(state->proto.iface, cur, false);
+
+       if ((cur = tb[NOTIFY_NEIGHBORS6]) != NULL)
+               proto_shell_parse_neighbor_list(state->proto.iface, cur, true);
+
        if ((cur = tb[NOTIFY_DNS]))
                interface_add_dns_server_list(&iface->proto_ip, cur);
 
@@ -584,7 +606,7 @@ fill_string_list(struct blob_attr *attr, char **argv, int max)
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                        return false;
 
-               if (!blobmsg_check_attr(cur, NULL))
+               if (!blobmsg_check_attr(cur, false))
                        return false;
 
                argv[argc++] = blobmsg_data(cur);
@@ -661,7 +683,7 @@ proto_shell_notify_error(struct proto_shell_state *state, struct blob_attr **tb)
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                        goto error;
 
-               if (!blobmsg_check_attr(cur, NULL))
+               if (!blobmsg_check_attr(cur, false))
                        goto error;
 
                data[n_data++] = blobmsg_data(cur);