proto-shell: don't accept up-notifications in teardown state

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

diff --git a/proto-shell.c b/proto-shell.c
index 45717bf..d85a8d7 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -187,6 +187,7 @@ proto_shell_handler(struct interface_proto_state *proto,
                uloop_timeout_set(&state->teardown_timeout, 5000);
        }
 
+       D(INTERFACE, "run %s for interface '%s'\n", action, proto->iface->name);
        config = blobmsg_format_json(state->config, true);
        if (!config)
                return -1;
@@ -431,7 +432,7 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        up = blobmsg_get_bool(tb[NOTIFY_LINK_UP]);
-       if (!up) {
+       if (!up || state->sm == S_TEARDOWN) {
                state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
                return 0;
        }
@@ -445,28 +446,31 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
                        dev_create = 2;
        }
 
-       if (iface->state != IFS_UP)
+       if (iface->state != IFS_UP || !iface->l3_dev.dev)
                keep = false;
 
-       dev = iface->main_dev.dev;
-       if (tb[NOTIFY_IFNAME] && !keep) {
-               keep = false;
-               devname = blobmsg_data(tb[NOTIFY_IFNAME]);
-               if (tb[NOTIFY_TUNNEL])
-                       dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
-               else
-                       dev = device_get(devname, dev_create);
-       }
+       if (!keep) {
+               dev = iface->main_dev.dev;
+               if (tb[NOTIFY_IFNAME]) {
+                       keep = false;
+                       devname = blobmsg_data(tb[NOTIFY_IFNAME]);
+                       if (tb[NOTIFY_TUNNEL])
+                               dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
+                       else
+                               dev = device_get(devname, dev_create);
+               }
 
-       if (!dev)
-               return UBUS_STATUS_INVALID_ARGUMENT;
+               if (!dev)
+                       return UBUS_STATUS_INVALID_ARGUMENT;
 
-       interface_set_l3_dev(iface, dev);
-       device_claim(&iface->l3_dev);
-       device_set_present(dev, true);
+               interface_set_l3_dev(iface, dev);
+               if (device_claim(&iface->l3_dev) < 0)
+                       return UBUS_STATUS_UNKNOWN_ERROR;
+
+               device_set_present(dev, true);
 
-       if (!keep)
                interface_update_start(iface);
+       }
 
        proto_apply_ip_settings(iface, data, addr_ext);