X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=998a44c55f7d4ee3f42d2fd7e84e63b439819d5d;hp=7a1896b8374b802d7c38743aed1d91d34dd73a95;hb=5e0fb81b9a9a8ad8ef582d8d29d7d243e1903100;hpb=92d2aea918f650f309f753349457028032d53280 diff --git a/proto-shell.c b/proto-shell.c index 7a1896b..998a44c 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -51,12 +51,14 @@ struct proto_shell_handler { 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 { @@ -66,6 +68,15 @@ 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; @@ -110,10 +121,16 @@ proto_shell_update_host_dep(struct proto_shell_dependency *dep) 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; @@ -284,9 +301,23 @@ proto_shell_task_finish(struct proto_shell_state *state, if (task == &state->proto_task) proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false); - if (task == &state->script_task && state->renew_pending) - proto_shell_handler(&state->proto, PROTO_CMD_RENEW, - false); + else if (task == &state->script_task) { + if (state->renew_pending) + proto_shell_handler(&state->proto, + PROTO_CMD_RENEW, false); + 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; case S_SETUP_ABORT: @@ -294,7 +325,9 @@ proto_shell_task_finish(struct proto_shell_state *state, 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; @@ -309,7 +342,9 @@ proto_shell_task_finish(struct proto_shell_state *state, 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; @@ -357,6 +392,7 @@ proto_shell_free(struct interface_proto_state *proto) 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); @@ -664,20 +700,20 @@ 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]; - 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 { @@ -686,7 +722,7 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att } 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); @@ -753,6 +789,45 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr) } } +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) @@ -760,6 +835,9 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface, 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)); @@ -767,6 +845,7 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface, 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; @@ -811,6 +890,10 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj) if (tmp && json_object_get_boolean(tmp)) handler->proto.flags |= PROTO_FLAG_NODEV; + tmp = json_get_field(obj, "no-proto-task", json_type_boolean); + 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)) handler->proto.flags |= PROTO_FLAG_INIT_AVAILABLE; @@ -823,6 +906,10 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj) 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);