+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * 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 <string.h>
#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,
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;
struct blob_attr *config;
- struct device_user l3_dev;
-
struct uloop_timeout teardown_timeout;
struct netifd_process script_task;
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)
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;
}
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)
{
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);
}
}
+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_HOST,
+ NOTIFY_DNS,
+ NOTIFY_DNS_SEARCH,
__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 },
+ [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
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);
+ 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)
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]))
+ proto_shell_parse_data(state->proto.iface, cur);
return 0;
}
}
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;
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;
}
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;
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);
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;
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]);
projects / project / netifd.git / blobdiff