X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=02f1836d8da4764fb37ff82cd014fff739afa431;hp=4cff09134f3a610077cd1e3cc88774f039b99b8c;hb=4108e7610019d63db6540de760feecf38c8b84dc;hpb=f4508267c9b5524c1ba9dffde16b1ab1dcd1f857 diff --git a/proto-shell.c b/proto-shell.c index 4cff091..02f1836 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #define _GNU_SOURCE #include @@ -17,8 +30,9 @@ #include "interface.h" #include "interface-ip.h" #include "proto.h" +#include "system.h" -static struct netifd_fd proto_fd; +static int proto_fd = -1; enum proto_shell_sm { S_IDLE, @@ -36,6 +50,16 @@ struct proto_shell_handler { char script_name[]; }; +struct proto_shell_dependency { + struct list_head list; + + struct proto_shell_state *proto; + struct interface_user dep; + + union if_addr host; + bool v6; +}; + struct proto_shell_state { struct interface_proto_state proto; struct proto_shell_handler *handler; @@ -50,8 +74,66 @@ struct proto_shell_state { bool proto_task_killed; int last_error; + + struct list_head deps; }; +static void +proto_shell_check_dependencies(struct proto_shell_state *state) +{ + struct proto_shell_dependency *dep; + bool available = true; + + list_for_each_entry(dep, &state->deps, list) { + if (dep->dep.iface) + continue; + + available = false; + break; + } + + interface_set_available(state->proto.iface, available); +} + +static void +proto_shell_if_up_cb(struct interface_user *dep, struct interface *iface, + enum interface_event ev); +static void +proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface, + enum interface_event ev); + +static void +proto_shell_update_host_dep(struct proto_shell_dependency *dep) +{ + struct interface *iface; + + if (dep->dep.iface) + goto out; + + iface = interface_ip_add_target_route(&dep->host, dep->v6); + if (!iface) + goto out; + + interface_remove_user(&dep->dep); + dep->dep.cb = proto_shell_if_down_cb; + interface_add_user(&dep->dep, iface); + +out: + proto_shell_check_dependencies(dep->proto); +} + +static void +proto_shell_clear_host_dep(struct proto_shell_state *state) +{ + struct proto_shell_dependency *dep, *tmp; + + list_for_each_entry_safe(dep, tmp, &state->deps, list) { + interface_remove_user(&dep->dep); + list_del(&dep->list); + free(dep); + } +} + static int proto_shell_handler(struct interface_proto_state *proto, enum interface_proto_cmd cmd, bool force) @@ -73,6 +155,7 @@ proto_shell_handler(struct interface_proto_state *proto, if (cmd == PROTO_CMD_SETUP) { action = "setup"; state->last_error = -1; + proto_shell_clear_host_dep(state); } else { if (state->sm == S_TEARDOWN) return 0; @@ -118,6 +201,41 @@ proto_shell_handler(struct interface_proto_state *proto, } static void +proto_shell_if_up_cb(struct interface_user *dep, struct interface *iface, + enum interface_event ev) +{ + struct proto_shell_dependency *pdep; + + if (ev != IFEV_UP) + return; + + pdep = container_of(dep, struct proto_shell_dependency, dep); + proto_shell_update_host_dep(pdep); +} + +static void +proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface, + enum interface_event ev) +{ + struct proto_shell_dependency *pdep; + struct proto_shell_state *state; + + if (ev == IFEV_UP) + return; + + pdep = container_of(dep, struct proto_shell_dependency, dep); + interface_remove_user(dep); + dep->cb = proto_shell_if_up_cb; + interface_add_user(dep, NULL); + + state = pdep->proto; + if (state->sm == S_IDLE) { + state->proto.proto_event(&state->proto, IFPEV_LINK_LOST); + proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false); + } +} + +static void proto_shell_task_finish(struct proto_shell_state *state, struct netifd_process *task) { @@ -199,6 +317,8 @@ proto_shell_free(struct interface_proto_state *proto) struct proto_shell_state *state; state = container_of(proto, struct proto_shell_state, proto); + uloop_timeout_cancel(&state->teardown_timeout); + proto_shell_clear_host_dep(state); netifd_kill_process(&state->script_task); netifd_kill_process(&state->proto_task); free(state->config); @@ -261,6 +381,10 @@ enum { NOTIFY_ROUTES6, NOTIFY_TUNNEL, NOTIFY_DATA, + NOTIFY_KEEP, + NOTIFY_HOST, + NOTIFY_DNS, + NOTIFY_DNS_SEARCH, __NOTIFY_LAST }; @@ -278,6 +402,10 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = { [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 }, + [NOTIFY_HOST] = { .name = "host", .type = BLOBMSG_TYPE_STRING }, + [NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, + [NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY }, }; static int @@ -289,6 +417,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]) @@ -300,6 +429,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) @@ -309,7 +441,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 { + } 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, @@ -324,9 +457,12 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, interface_set_l3_dev(iface, dev); device_claim(&iface->l3_dev); + device_set_present(dev, true); } - interface_update_start(iface); + if (!keep) + interface_update_start(iface); + proto_apply_ip_settings(iface, data, addr_ext); if ((cur = tb[NOTIFY_ROUTES]) != NULL) @@ -335,9 +471,16 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, if ((cur = tb[NOTIFY_ROUTES6]) != NULL) proto_shell_parse_route_list(state->proto.iface, cur, true); + if ((cur = tb[NOTIFY_DNS])) + interface_add_dns_server_list(&iface->proto_ip, cur); + + if ((cur = tb[NOTIFY_DNS_SEARCH])) + interface_add_dns_search_list(&iface->proto_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])) @@ -469,6 +612,48 @@ proto_shell_set_available(struct proto_shell_state *state, struct blob_attr **tb } static int +proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_attr **tb) +{ + struct proto_shell_dependency *dep; + struct blob_attr *host = tb[NOTIFY_HOST]; + + if (!host) + return UBUS_STATUS_INVALID_ARGUMENT; + + dep = calloc(1, sizeof(*dep)); + if (!inet_pton(AF_INET, blobmsg_data(host), &dep->host)) { + free(dep); + return UBUS_STATUS_INVALID_ARGUMENT; + } + + dep->proto = state; + dep->dep.cb = proto_shell_if_up_cb; + interface_add_user(&dep->dep, NULL); + list_add(&dep->list, &state->deps); + proto_shell_update_host_dep(dep); + if (!dep->dep.iface) + return UBUS_STATUS_NOT_FOUND; + + return 0; +} + +static int +proto_shell_setup_failed(struct proto_shell_state *state) +{ + switch (state->sm) { + case S_IDLE: + state->proto.proto_event(&state->proto, IFPEV_LINK_LOST); + /* fall through */ + case S_SETUP: + proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false); + break; + default: + break; + } + return 0; +} + +static int proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr) { struct proto_shell_state *state; @@ -493,6 +678,10 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr) return proto_shell_block_restart(state, tb); case 5: return proto_shell_set_available(state, tb); + case 6: + return proto_shell_add_host_dependency(state, tb); + case 7: + return proto_shell_setup_failed(state); default: return UBUS_STATUS_INVALID_ARGUMENT; } @@ -505,6 +694,8 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface, struct proto_shell_state *state; state = calloc(1, sizeof(*state)); + INIT_LIST_HEAD(&state->deps); + state->config = malloc(blob_pad_len(attr)); if (!state->config) goto error; @@ -515,10 +706,10 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface, state->proto.cb = proto_shell_handler; state->teardown_timeout.cb = proto_shell_teardown_timeout_cb; state->script_task.cb = proto_shell_script_cb; - state->script_task.dir_fd = proto_fd.fd; + state->script_task.dir_fd = proto_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.dir_fd = proto_fd; state->proto_task.log_prefix = iface->name; state->handler = container_of(h, struct proto_shell_handler, proto); @@ -622,15 +813,12 @@ proto_shell_add_handler(const char *script, json_object *obj) name = json_object_get_string(tmp); - handler = calloc(1, sizeof(*handler) + - strlen(script) + 1 + - strlen(name) + 1); + handler = calloc_a(sizeof(*handler) + strlen(script) + 1, + &str, strlen(name) + 1); if (!handler) return; strcpy(handler->script_name, script); - - str = handler->script_name + strlen(handler->script_name) + 1; strcpy(str, name); proto = &handler->proto; @@ -718,11 +906,11 @@ static void __init proto_shell_init(void) if (chdir("./proto")) goto close_cur; - proto_fd.fd = open(".", O_RDONLY | O_DIRECTORY); - if (proto_fd.fd < 0) + proto_fd = open(".", O_RDONLY | O_DIRECTORY); + if (proto_fd < 0) goto close_cur; - netifd_fd_add(&proto_fd); + system_fd_set_cloexec(proto_fd); glob("./*.sh", 0, NULL, &g); for (i = 0; i < g.gl_pathc; i++) proto_shell_add_script(g.gl_pathv[i]);