convert interface event queueing to global interface notifier

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

diff --git a/proto-shell.c b/proto-shell.c
index 492d0e4..ea15fd9 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -41,8 +41,6 @@ struct proto_shell_state {
        struct proto_shell_handler *handler;
        struct blob_attr *config;
 
-       struct device_user l3_dev;
-
        struct uloop_timeout teardown_timeout;
 
        struct netifd_process script_task;
@@ -201,6 +199,8 @@ proto_shell_free(struct interface_proto_state *proto)
        struct proto_shell_state *state;
 
        state = container_of(proto, struct proto_shell_state, proto);
+       netifd_kill_process(&state->script_task);
+       netifd_kill_process(&state->proto_task);
        free(state->config);
        free(state);
 }
@@ -222,6 +222,16 @@ proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
        }
 }
 
+static void
+proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
+{
+       struct blob_attr *cur;
+       int rem;
+
+       blobmsg_for_each_attr(cur, attr, rem)
+               interface_add_data(iface, cur);
+}
+
 static struct device *
 proto_shell_create_tunnel(const char *name, struct blob_attr *attr)
 {
@@ -250,6 +260,8 @@ enum {
        NOTIFY_ROUTES,
        NOTIFY_ROUTES6,
        NOTIFY_TUNNEL,
+       NOTIFY_DATA,
+       NOTIFY_KEEP,
        __NOTIFY_LAST
 };
 
@@ -266,6 +278,8 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
        [NOTIFY_ROUTES] = { .name = "routes", .type = BLOBMSG_TYPE_ARRAY },
        [NOTIFY_ROUTES6] = { .name = "routes6", .type = BLOBMSG_TYPE_ARRAY },
        [NOTIFY_TUNNEL] = { .name = "tunnel", .type = BLOBMSG_TYPE_TABLE },
+       [NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
+       [NOTIFY_KEEP] = { .name = "keep", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static int
@@ -277,6 +291,7 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
        const char *devname;
        int dev_create = 1;
        bool addr_ext = false;
+       bool keep = false;
        bool up;
 
        if (!tb[NOTIFY_LINK_UP])
@@ -288,6 +303,9 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
                return 0;
        }
 
+       if ((cur = tb[NOTIFY_KEEP]) != NULL)
+               keep = blobmsg_get_bool(cur);
+
        if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL) {
                addr_ext = blobmsg_get_bool(cur);
                if (addr_ext)
@@ -297,10 +315,8 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
        if (!tb[NOTIFY_IFNAME]) {
                if (!iface->main_dev.dev)
                        return UBUS_STATUS_INVALID_ARGUMENT;
-       } else {
-               if (state->l3_dev.dev)
-                       device_remove_user(&state->l3_dev);
-
+       } else if (!keep || iface->state != IFS_UP) {
+               keep = false;
                devname = blobmsg_data(tb[NOTIFY_IFNAME]);
                if (tb[NOTIFY_TUNNEL]) {
                        dev = proto_shell_create_tunnel(devname,
@@ -313,12 +329,13 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
                                return UBUS_STATUS_NOT_FOUND;
                }
 
-               device_add_user(&state->l3_dev, dev);
-               iface->l3_dev = &state->l3_dev;
-               device_claim(&state->l3_dev);
+               interface_set_l3_dev(iface, dev);
+               device_claim(&iface->l3_dev);
        }
 
-       interface_update_start(iface);
+       if (!keep)
+               interface_update_start(iface);
+
        proto_apply_ip_settings(iface, data, addr_ext);
 
        if ((cur = tb[NOTIFY_ROUTES]) != NULL)
@@ -329,7 +346,12 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 
        interface_update_complete(state->proto.iface);
 
-       state->proto.proto_event(&state->proto, IFPEV_UP);
+       if (!keep)
+               state->proto.proto_event(&state->proto, IFPEV_UP);
+       state->sm = S_IDLE;
+
+       if ((cur = tb[NOTIFY_DATA]))
+               proto_shell_parse_data(state->proto.iface, cur);
 
        return 0;
 }