#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,
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);
NOTIFY_DATA,
NOTIFY_KEEP,
NOTIFY_HOST,
+ NOTIFY_DNS,
+ NOTIFY_DNS_SEARCH,
__NOTIFY_LAST
};
[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
interface_set_l3_dev(iface, dev);
device_claim(&iface->l3_dev);
+ device_set_present(dev, true);
}
if (!keep)
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);
if (!keep)
}
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_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;
}
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);
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]);