char *config_buf;
char *script_name;
bool init_available;
- bool no_proto_task;
struct uci_blob_param_list config;
};
struct proto_shell_dependency {
struct list_head list;
- char *interface;
struct proto_shell_state *proto;
struct interface_user dep;
union if_addr host;
bool v6;
+ bool any;
+
+ char interface[];
};
struct proto_shell_state {
struct uloop_timeout teardown_timeout;
+ /*
+ * Teardown and setup interface again if it is still not up (IFS_UP)
+ * after checkup_interval seconds since previous attempt. This check
+ * will be disabled when the config option "checkup_interval" is
+ * missing or has a negative value
+ */
+ int checkup_interval;
+ struct uloop_timeout checkup_timeout;
+
struct netifd_process script_task;
struct netifd_process proto_task;
if (dep->dep.iface)
goto out;
- if (dep->interface[0])
+ if (dep->interface[0]) {
iface = vlist_find(&interfaces, dep->interface, iface, node);
- iface = interface_ip_add_target_route(&dep->host, dep->v6, iface);
+ if (!iface || iface->state != IFS_UP)
+ goto out;
+ }
+
+ if (!dep->any)
+ iface = interface_ip_add_target_route(&dep->host, dep->v6, iface);
+
if (!iface)
goto out;
state->sm = S_SETUP;
break;
- case S_SETUP_ABORT:
- case S_TEARDOWN:
- case S_SETUP:
- return 0;
-
default:
return -1;
}
state->sm = S_SETUP_ABORT;
return 0;
}
- /* fall through if no script task is running */
+ /* if no script task is running */
+ /* fall through */
case S_IDLE:
action = "teardown";
state->renew_pending = false;
if (state->renew_pending)
proto_shell_handler(&state->proto,
PROTO_CMD_RENEW, false);
- else if (!state->handler->no_proto_task &&
+ else if (!(state->handler->proto.flags & PROTO_FLAG_NO_TASK) &&
!state->proto_task.uloop.pending &&
state->sm == S_SETUP)
proto_shell_handler(&state->proto,
PROTO_CMD_TEARDOWN,
false);
+
+ /* check up status after setup attempt by this script_task */
+ if (state->sm == S_SETUP && state->checkup_interval > 0) {
+ uloop_timeout_set(&state->checkup_timeout,
+ state->checkup_interval * 1000);
+ }
}
break;
state->proto_task.uloop.pending)
break;
+ /* completed aborting all tasks, now idle */
uloop_timeout_cancel(&state->teardown_timeout);
+ uloop_timeout_cancel(&state->checkup_timeout);
state->sm = S_IDLE;
proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
break;
break;
}
+ /* completed tearing down all tasks, now idle */
uloop_timeout_cancel(&state->teardown_timeout);
+ uloop_timeout_cancel(&state->checkup_timeout);
state->sm = S_IDLE;
state->proto.proto_event(&state->proto, IFPEV_DOWN);
break;
state = container_of(proto, struct proto_shell_state, proto);
uloop_timeout_cancel(&state->teardown_timeout);
+ uloop_timeout_cancel(&state->checkup_timeout);
proto_shell_clear_host_dep(state);
netifd_kill_process(&state->script_task);
netifd_kill_process(&state->proto_task);
}
}
+static void
+proto_shell_parse_neighbor_list(struct interface *iface, struct blob_attr *attr,
+ bool v6)
+{
+ struct blob_attr *cur;
+ int rem;
+
+ blobmsg_for_each_attr(cur, attr, rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) {
+ DPRINTF("Ignore wrong neighbor type: %d\n", blobmsg_type(cur));
+ continue;
+ }
+
+ interface_ip_add_neighbor(iface, cur, v6);
+ }
+}
+
static void
proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
{
NOTIFY_HOST,
NOTIFY_DNS,
NOTIFY_DNS_SEARCH,
+ NOTIFY_NEIGHBORS,
+ NOTIFY_NEIGHBORS6,
__NOTIFY_LAST
};
[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 },
+ [NOTIFY_NEIGHBORS]= {.name = "neighbor", .type = BLOBMSG_TYPE_ARRAY},
+ [NOTIFY_NEIGHBORS6]= {.name = "neighbor6", .type = BLOBMSG_TYPE_ARRAY},
};
static int
return UBUS_STATUS_UNKNOWN_ERROR;
device_set_present(dev, true);
-
- interface_update_start(iface);
}
+ interface_update_start(iface, keep);
+
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_NEIGHBORS]) != NULL)
+ proto_shell_parse_neighbor_list(state->proto.iface, cur, false);
+
+ if ((cur = tb[NOTIFY_NEIGHBORS6]) != NULL)
+ proto_shell_parse_neighbor_list(state->proto.iface, cur, true);
+
if ((cur = tb[NOTIFY_DNS]))
interface_add_dns_server_list(&iface->proto_ip, cur);
interface_update_complete(state->proto.iface);
if ((state->sm != S_SETUP_ABORT) && (state->sm != S_TEARDOWN)) {
- if (!keep)
- state->proto.proto_event(&state->proto, IFPEV_UP);
+ state->proto.proto_event(&state->proto, IFPEV_UP);
state->sm = S_IDLE;
}
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
return false;
- if (!blobmsg_check_attr(cur, NULL))
+ if (!blobmsg_check_attr(cur, false))
return false;
argv[argc++] = blobmsg_data(cur);
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
goto error;
- if (!blobmsg_check_attr(cur, NULL))
+ if (!blobmsg_check_attr(cur, false))
goto error;
data[n_data++] = blobmsg_data(cur);
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];
- struct blob_attr *ifname_a = tb[NOTIFY_IFNAME];
- const char *ifname_str = ifname_a ? blobmsg_data(ifname_a) : "";
- char *ifname;
+ const char *ifname = tb[NOTIFY_IFNAME] ? blobmsg_data(tb[NOTIFY_IFNAME]) : "";
+ const char *host = tb[NOTIFY_HOST] ? blobmsg_data(tb[NOTIFY_HOST]) : "";
if (state->sm == S_TEARDOWN || state->sm == S_SETUP_ABORT)
return UBUS_STATUS_PERMISSION_DENIED;
- if (!host)
- return UBUS_STATUS_INVALID_ARGUMENT;
+ dep = calloc(1, sizeof(*dep) + strlen(ifname) + 1);
+ if (!dep)
+ return UBUS_STATUS_UNKNOWN_ERROR;
- dep = calloc_a(sizeof(*dep), &ifname, strlen(ifname_str) + 1);
- if (inet_pton(AF_INET, blobmsg_data(host), &dep->host) < 1) {
- if (inet_pton(AF_INET6, blobmsg_data(host), &dep->host) < 1) {
+ if (!host[0] && ifname[0]) {
+ dep->any = true;
+ } else if (inet_pton(AF_INET, host, &dep->host) < 1) {
+ if (inet_pton(AF_INET6, host, &dep->host) < 1) {
free(dep);
return UBUS_STATUS_INVALID_ARGUMENT;
} else {
}
dep->proto = state;
- dep->interface = strcpy(ifname, ifname_str);
+ strcpy(dep->interface, ifname);
dep->dep.cb = proto_shell_if_up_cb;
interface_add_user(&dep->dep, NULL);
}
}
+static void
+proto_shell_checkup_timeout_cb(struct uloop_timeout *timeout)
+{
+ struct proto_shell_state *state = container_of(timeout, struct
+ proto_shell_state, checkup_timeout);
+ struct interface_proto_state *proto = &state->proto;
+ struct interface *iface = proto->iface;
+
+ if (!iface->autostart)
+ return;
+
+ if (iface->state == IFS_UP)
+ return;
+
+ D(INTERFACE, "Interface '%s' is not up after %d sec\n",
+ iface->name, state->checkup_interval);
+ proto_shell_handler(proto, PROTO_CMD_TEARDOWN, false);
+}
+
+static void
+proto_shell_checkup_attach(struct proto_shell_state *state,
+ const struct blob_attr *attr)
+{
+ struct blob_attr *tb;
+ struct blobmsg_policy checkup_policy = {
+ .name = "checkup_interval",
+ .type = BLOBMSG_TYPE_INT32
+ };
+
+ blobmsg_parse(&checkup_policy, 1, &tb, blob_data(attr), blob_len(attr));
+ if (!tb) {
+ state->checkup_interval = -1;
+ state->checkup_timeout.cb = NULL;
+ } else {
+ state->checkup_interval = blobmsg_get_u32(tb);
+ state->checkup_timeout.cb = proto_shell_checkup_timeout_cb;
+ }
+}
+
static struct interface_proto_state *
proto_shell_attach(const struct proto_handler *h, struct interface *iface,
struct blob_attr *attr)
struct proto_shell_state *state;
state = calloc(1, sizeof(*state));
+ if (!state)
+ return NULL;
+
INIT_LIST_HEAD(&state->deps);
state->config = malloc(blob_pad_len(attr));
goto error;
memcpy(state->config, attr, blob_pad_len(attr));
+ proto_shell_checkup_attach(state, state->config);
state->proto.free = proto_shell_free;
state->proto.notify = proto_shell_notify;
state->proto.cb = proto_shell_handler;
handler->proto.flags |= PROTO_FLAG_NODEV;
tmp = json_get_field(obj, "no-proto-task", json_type_boolean);
- handler->no_proto_task = tmp && json_object_get_boolean(tmp);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_NO_TASK;
tmp = json_get_field(obj, "available", json_type_boolean);
if (tmp && json_object_get_boolean(tmp))
if (tmp && json_object_get_boolean(tmp))
handler->proto.flags |= PROTO_FLAG_LASTERROR;
+ tmp = json_get_field(obj, "teardown-on-l3-link-down", json_type_boolean);
+ if (tmp && json_object_get_boolean(tmp))
+ handler->proto.flags |= PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN;
+
config = json_get_field(obj, "config", json_type_array);
if (config)
handler->config_buf = netifd_handler_parse_config(&handler->config, config);
projects / project / netifd.git / blobdiff