struct proto_shell_handler *handler;
struct blob_attr *config;
- struct device_user l3_dev;
-
struct uloop_timeout teardown_timeout;
- struct netifd_process setup_task;
- struct netifd_process teardown_task;
+ struct netifd_process script_task;
struct netifd_process proto_task;
enum proto_shell_sm sm;
state = container_of(proto, struct proto_shell_state, proto);
handler = state->handler;
+ proc = &state->script_task;
if (cmd == PROTO_CMD_SETUP) {
action = "setup";
- proc = &state->setup_task;
state->last_error = -1;
} else {
if (state->sm == S_TEARDOWN)
return 0;
- if (state->setup_task.uloop.pending) {
+ if (state->script_task.uloop.pending) {
if (state->sm != S_SETUP_ABORT) {
uloop_timeout_set(&state->teardown_timeout, 1000);
- kill(state->setup_task.uloop.pid, SIGTERM);
+ kill(state->script_task.uloop.pid, SIGTERM);
if (state->proto_task.uloop.pending)
kill(state->proto_task.uloop.pid, SIGTERM);
state->sm = S_SETUP_ABORT;
}
action = "teardown";
- proc = &state->teardown_task;
state->sm = S_TEARDOWN;
if (state->last_error >= 0) {
snprintf(error_buf, sizeof(error_buf), "ERROR=%d", state->last_error);
break;
case S_SETUP_ABORT:
- if (state->setup_task.uloop.pending ||
+ if (state->script_task.uloop.pending ||
state->proto_task.uloop.pending)
break;
break;
case S_TEARDOWN:
- if (state->teardown_task.uloop.pending)
+ if (state->script_task.uloop.pending)
break;
if (state->proto_task.uloop.pending) {
state = container_of(timeout, struct proto_shell_state, teardown_timeout);
- netifd_kill_process(&state->setup_task);
+ netifd_kill_process(&state->script_task);
netifd_kill_process(&state->proto_task);
- netifd_kill_process(&state->teardown_task);
proto_shell_task_finish(state, NULL);
}
static void
-proto_shell_setup_cb(struct netifd_process *p, int ret)
-{
- struct proto_shell_state *state;
-
- state = container_of(p, struct proto_shell_state, setup_task);
- proto_shell_task_finish(state, p);
-}
-
-static void
-proto_shell_teardown_cb(struct netifd_process *p, int ret)
+proto_shell_script_cb(struct netifd_process *p, int ret)
{
struct proto_shell_state *state;
- state = container_of(p, struct proto_shell_state, teardown_task);
+ state = container_of(p, struct proto_shell_state, script_task);
proto_shell_task_finish(state, p);
}
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);
}
static void
-proto_shell_parse_addr_list(struct interface_ip_settings *ip, struct blob_attr *attr,
- bool v6, bool external)
+proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
+ bool v6)
{
- struct device_addr *addr;
struct blob_attr *cur;
int rem;
blobmsg_for_each_attr(cur, attr, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) {
- DPRINTF("Ignore wrong address type: %d\n", blobmsg_type(cur));
- continue;
- }
-
- addr = proto_parse_ip_addr_string(blobmsg_data(cur), v6, v6 ? 32 : 128);
- if (!addr) {
- DPRINTF("Failed to parse IP address string: %s\n", (char *) blobmsg_data(cur));
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
+ DPRINTF("Ignore wrong route type: %d\n", blobmsg_type(cur));
continue;
}
- if (external)
- addr->flags |= DEVADDR_EXTERNAL;
-
- vlist_add(&ip->addr, &addr->node);
+ interface_ip_add_route(iface, cur, v6);
}
}
static void
-proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr,
- bool v6)
+proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
{
struct blob_attr *cur;
int rem;
- blobmsg_for_each_attr(cur, attr, rem) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
- DPRINTF("Ignore wrong route type: %d\n", blobmsg_type(cur));
- continue;
- }
+ blobmsg_for_each_attr(cur, attr, rem)
+ interface_add_data(iface, cur);
+}
- interface_ip_add_route(iface, cur, v6);
- }
+static struct device *
+proto_shell_create_tunnel(const char *name, struct blob_attr *attr)
+{
+ struct device *dev;
+ struct blob_buf b;
+
+ memset(&b, 0, sizeof(b));
+ blob_buf_init(&b, 0);
+ blob_put(&b, 0, blobmsg_data(attr), blobmsg_data_len(attr));
+ dev = device_create(name, &tunnel_device_type, blob_data(b.head));
+ blob_buf_free(&b);
+
+ return dev;
}
enum {
NOTIFY_LINK_UP,
NOTIFY_IFNAME,
NOTIFY_ADDR_EXT,
- NOTIFY_IPADDR,
- NOTIFY_IP6ADDR,
NOTIFY_ROUTES,
NOTIFY_ROUTES6,
- NOTIFY_DNS,
- NOTIFY_DNS_SEARCH,
+ NOTIFY_TUNNEL,
+ NOTIFY_DATA,
+ NOTIFY_KEEP,
__NOTIFY_LAST
};
[NOTIFY_LINK_UP] = { .name = "link-up", .type = BLOBMSG_TYPE_BOOL },
[NOTIFY_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
[NOTIFY_ADDR_EXT] = { .name = "address-external", .type = BLOBMSG_TYPE_BOOL },
- [NOTIFY_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
- [NOTIFY_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_ROUTES] = { .name = "routes", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_ROUTES6] = { .name = "routes6", .type = BLOBMSG_TYPE_ARRAY },
- [NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
- [NOTIFY_DNS_SEARCH] = { .name = "dns_search", .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
-proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
+proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, struct blob_attr **tb)
{
- struct interface_ip_settings *ip;
+ struct interface *iface = state->proto.iface;
struct blob_attr *cur;
+ struct device *dev;
+ 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 (!state->proto.iface->main_dev.dev)
+ 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,
+ tb[NOTIFY_TUNNEL]);
+ if (!dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ } else {
+ dev = device_get(devname, dev_create);
+ if (!dev)
+ return UBUS_STATUS_NOT_FOUND;
+ }
- device_add_user(&state->l3_dev,
- device_get(blobmsg_data(tb[NOTIFY_IFNAME]), dev_create));
- state->proto.iface->l3_dev = &state->l3_dev;
- device_claim(&state->l3_dev);
+ interface_set_l3_dev(iface, dev);
+ device_claim(&iface->l3_dev);
}
- ip = &state->proto.iface->proto_ip;
- interface_update_start(state->proto.iface);
+ if (!keep)
+ interface_update_start(iface);
- if ((cur = tb[NOTIFY_IPADDR]) != NULL)
- proto_shell_parse_addr_list(ip, cur, false, addr_ext);
-
- if ((cur = tb[NOTIFY_IP6ADDR]) != NULL)
- proto_shell_parse_addr_list(ip, cur, true, addr_ext);
+ proto_apply_ip_settings(iface, data, addr_ext);
if ((cur = tb[NOTIFY_ROUTES]) != NULL)
proto_shell_parse_route_list(state->proto.iface, cur, false);
if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
proto_shell_parse_route_list(state->proto.iface, cur, true);
- if ((cur = tb[NOTIFY_DNS]) != NULL)
- interface_add_dns_server_list(ip, cur);
-
- if ((cur = tb[NOTIFY_DNS_SEARCH]) != NULL)
- interface_add_dns_search_list(ip, cur);
-
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;
}
switch(blobmsg_get_u32(tb[NOTIFY_ACTION])) {
case 0:
- return proto_shell_update_link(state, tb);
+ return proto_shell_update_link(state, attr, tb);
case 1:
return proto_shell_run_command(state, tb);
case 2:
state->proto.notify = proto_shell_notify;
state->proto.cb = proto_shell_handler;
state->teardown_timeout.cb = proto_shell_teardown_timeout_cb;
- state->setup_task.cb = proto_shell_setup_cb;
- state->setup_task.dir_fd = proto_fd.fd;
- state->setup_task.log_prefix = iface->name;
- state->teardown_task.cb = proto_shell_teardown_cb;
- state->teardown_task.dir_fd = proto_fd.fd;
- state->teardown_task.log_prefix = iface->name;
+ state->script_task.cb = proto_shell_script_cb;
+ state->script_task.dir_fd = proto_fd.fd;
+ state->script_task.log_prefix = iface->name;
state->proto_task.cb = proto_shell_task_cb;
state->proto_task.dir_fd = proto_fd.fd;
state->proto_task.log_prefix = iface->name;
projects / project / netifd.git / blobdiff