proto-shell: add l3 interface claim/release

diff --git a/interface-ip.c b/interface-ip.c
index baa8b0e81dad85f25ee491c48cf8e497aacaecb3..e651d39906b1ee5cc18e3eaf982688391ab31c8d 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -20,7 +20,7 @@ interface_update_proto_addr(struct vlist_tree *tree,
        struct device_addr *addr;
 
        iface = container_of(tree, struct interface, proto_addr);
-       dev = iface->l3_iface->dev;
+       dev = iface->l3_dev->dev;
 
        if (node_old) {
                addr = container_of(node_old, struct device_addr, node);
@@ -44,7 +44,7 @@ interface_update_proto_route(struct vlist_tree *tree,
        struct device_route *route;
 
        iface = container_of(tree, struct interface, proto_route);
-       dev = iface->l3_iface->dev;
+       dev = iface->l3_dev->dev;
 
        if (node_old) {
                route = container_of(node_old, struct device_route, node);

diff --git a/interface.c b/interface.c
index acfe8b156457d60c1c788899d5a728e4ef9bdd06..72ecf4d975cb64b07c30ebc1ccee9e66153f271e 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -219,7 +219,7 @@ interface_alloc(const char *name, struct blob_attr *attr)
 
        iface = calloc(1, sizeof(*iface));
        iface->main_dev.cb = interface_cb;
-       iface->l3_iface = &iface->main_dev;
+       iface->l3_dev = &iface->main_dev;
        strncpy(iface->name, name, sizeof(iface->name) - 1);
        list_add_tail(&iface->list, &interfaces);
        INIT_LIST_HEAD(&iface->errors);

diff --git a/interface.h b/interface.h
index 72a00c98c41b7ff6de7bfc254076505946e4b04b..9708a5e4113230dba9fe45ade8fa81926fd85e68 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -44,7 +44,7 @@ struct interface {
        struct device_user main_dev;
 
        /* interface that layer 3 communication will go through */
-       struct device_user *l3_iface;
+       struct device_user *l3_dev;
 
        struct config_state config;
 

diff --git a/proto-shell.c b/proto-shell.c
index 1862809209513d7190838d89b22cd445d64f1e55..1481b66e2773aee616c3b6c3e3c200b6c198f484 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -29,6 +29,8 @@ struct proto_shell_state {
        struct proto_shell_handler *handler;
        struct blob_attr *config;
 
+       struct device_user l3_dev;
+
        struct uloop_timeout setup_timeout;
        struct uloop_process setup_task;
        struct uloop_process teardown_task;
@@ -58,6 +60,15 @@ run_script(const char **argv, struct uloop_process *proc)
        return 0;
 }
 
+static void
+proto_shell_set_down(struct proto_shell_state *state)
+{
+       if (!state->l3_dev.dev)
+               return;
+
+       device_remove_user(&state->l3_dev);
+}
+
 static int
 proto_shell_handler(struct interface_proto_state *proto,
                    enum interface_proto_cmd cmd, bool force)
@@ -134,6 +145,7 @@ proto_shell_teardown_cb(struct uloop_process *p, int ret)
        struct proto_shell_state *state;
 
        state = container_of(p, struct proto_shell_state, teardown_task);
+       proto_shell_set_down(state);
        state->proto.proto_event(&state->proto, IFPEV_DOWN);
 }
 
@@ -147,6 +159,47 @@ proto_shell_free(struct interface_proto_state *proto)
        free(state);
 }
 
+enum {
+       NOTIFY_LINK_UP,
+       NOTIFY_IFNAME,
+       __NOTIFY_LAST
+};
+
+static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
+       [NOTIFY_LINK_UP] = { .name = "link-up", .type = BLOBMSG_TYPE_BOOL },
+       [NOTIFY_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+};
+
+static int
+proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
+{
+       struct proto_shell_state *state;
+       struct blob_attr *tb[__NOTIFY_LAST];
+       bool up;
+
+       state = container_of(proto, struct proto_shell_state, proto);
+
+       blobmsg_parse(notify_attr, __NOTIFY_LAST, tb, blob_data(attr), blob_len(attr));
+       if (!tb[NOTIFY_LINK_UP])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       up = blobmsg_get_bool(tb[NOTIFY_LINK_UP]);
+       if (up) {
+               if (!tb[NOTIFY_IFNAME])
+                       return UBUS_STATUS_INVALID_ARGUMENT;
+
+               device_add_user(&state->l3_dev,
+                       device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
+               device_claim(&state->l3_dev);
+               state->proto.iface->l3_dev = &state->l3_dev;
+               state->proto.proto_event(&state->proto, IFPEV_UP);
+       } else {
+               proto_shell_set_down(state);
+       }
+
+       return 0;
+}
+
 struct interface_proto_state *
 proto_shell_attach(const struct proto_handler *h, struct interface *iface,
                   struct blob_attr *attr)
@@ -160,6 +213,7 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
 
        memcpy(state->config, attr, blob_pad_len(attr));
        state->proto.free = proto_shell_free;
+       state->proto.notify = proto_shell_notify;
        state->proto.cb = proto_shell_handler;
        state->setup_timeout.cb = proto_shell_setup_timeout_cb;
        state->setup_task.cb = proto_shell_setup_cb;