struct proto_shell_handler *handler;
struct blob_attr *config;
- struct device_user l3_dev;
-
struct uloop_timeout teardown_timeout;
struct netifd_process script_task;
if (state->sm == S_TEARDOWN)
return 0;
- if (state->l3_dev.dev)
- device_remove_user(&state->l3_dev);
-
if (state->script_task.uloop.pending) {
if (state->sm != S_SETUP_ABORT) {
uloop_timeout_set(&state->teardown_timeout, 1000);
struct proto_shell_state *state;
state = container_of(proto, struct proto_shell_state, proto);
- if (state->l3_dev.dev)
- device_remove_user(&state->l3_dev);
netifd_kill_process(&state->script_task);
netifd_kill_process(&state->proto_task);
free(state->config);
}
}
+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)
{
NOTIFY_ROUTES,
NOTIFY_ROUTES6,
NOTIFY_TUNNEL,
+ NOTIFY_DATA,
+ NOTIFY_KEEP,
__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
const char *devname;
int dev_create = 1;
bool addr_ext = false;
+ bool keep = false;
bool up;
if (!tb[NOTIFY_LINK_UP])
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)
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,
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)
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;
}