X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=9ad28ac3bde7ac83008f45850c8f4b418091704e;hp=0e1412ba53bda1e40839eef264ce67261fe32842;hb=937a95ad71e00e99bd21add761e2f810b7fb4026;hpb=745016bc4a0c143296861d6a322042f217467e28 diff --git a/proto-shell.c b/proto-shell.c index 0e1412b..9ad28ac 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -18,7 +18,7 @@ #include "interface-ip.h" #include "proto.h" -static int proto_fd; +static struct netifd_fd proto_fd; struct proto_shell_handler { struct list_head list; @@ -86,7 +86,7 @@ proto_shell_handler(struct interface_proto_state *proto, argv[i++] = proto->iface->main_dev.dev->ifname; argv[i] = NULL; - ret = netifd_start_process(argv, NULL, proto_fd, proc); + ret = netifd_start_process(argv, NULL, proc); free(config); return ret; @@ -125,10 +125,6 @@ proto_shell_teardown_cb(struct netifd_process *p, int ret) return; netifd_kill_process(&state->proto_task); - - if (state->l3_dev.dev) - device_remove_user(&state->l3_dev); - state->proto.proto_event(&state->proto, IFPEV_DOWN); } @@ -165,7 +161,7 @@ proto_shell_free(struct interface_proto_state *proto) } static void -proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr, +proto_shell_parse_addr_list(struct interface_ip_settings *ip, struct blob_attr *attr, bool v6, bool external) { struct device_addr *addr; @@ -187,72 +183,10 @@ proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr, if (external) addr->flags |= DEVADDR_EXTERNAL; - vlist_add(&iface->proto_addr, &addr->node); + vlist_add(&ip->addr, &addr->node); } } -enum { - ROUTE_TARGET, - ROUTE_MASK, - ROUTE_GATEWAY, - ROUTE_DEVICE, - __ROUTE_LAST -}; - -static const struct blobmsg_policy route_attr[__ROUTE_LAST] = { - [ROUTE_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING }, - [ROUTE_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_STRING }, - [ROUTE_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING }, - [ROUTE_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING }, -}; - -static void -parse_route(struct interface *iface, struct blob_attr *attr, bool v6) -{ - struct blob_attr *tb[__ROUTE_LAST], *cur; - struct device_route *route; - int af = v6 ? AF_INET6 : AF_INET; - - blobmsg_parse(route_attr, __ROUTE_LAST, tb, blobmsg_data(attr), blobmsg_data_len(attr)); - - if (!tb[ROUTE_GATEWAY] && !tb[ROUTE_DEVICE]) - return; - - route = calloc(1, sizeof(*route)); - if (!route) - return; - - route->mask = v6 ? 128 : 32; - if ((cur = tb[ROUTE_MASK]) != NULL) { - route->mask = parse_netmask_string(blobmsg_data(cur), v6); - if (route->mask > (v6 ? 128 : 32)) - goto error; - } - - if ((cur = tb[ROUTE_TARGET]) != NULL) { - if (!inet_pton(af, blobmsg_data(cur), &route->addr)) { - DPRINTF("Failed to parse route target: %s\n", (char *) blobmsg_data(cur)); - goto error; - } - } - - if ((cur = tb[ROUTE_GATEWAY]) != NULL) { - if (!inet_pton(af, blobmsg_data(cur), &route->nexthop)) { - DPRINTF("Failed to parse route gateway: %s\n", (char *) blobmsg_data(cur)); - goto error; - } - } - - if ((cur = tb[ROUTE_DEVICE]) != NULL) - route->device = device_get(blobmsg_data(cur), true); - - vlist_add(&iface->proto_route, &route->node); - return; - -error: - free(route); -} - static void proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr, bool v6) @@ -266,7 +200,7 @@ proto_shell_parse_route_list(struct interface *iface, struct blob_attr *attr, continue; } - parse_route(iface, cur, v6); + interface_ip_add_route(iface, cur, v6); } } @@ -306,6 +240,7 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = { static int proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb) { + struct interface_ip_settings *ip; struct blob_attr *cur; bool addr_ext = false; bool up; @@ -322,23 +257,27 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb) if (!tb[NOTIFY_IFNAME]) { if (!state->proto.iface->main_dev.dev) return UBUS_STATUS_INVALID_ARGUMENT; - } else if (!state->l3_dev.dev) { + } else { + if (state->l3_dev.dev) + device_remove_user(&state->l3_dev); + device_add_user(&state->l3_dev, device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true)); - device_claim(&state->l3_dev); state->proto.iface->l3_dev = &state->l3_dev; + device_claim(&state->l3_dev); } - interface_ip_update_start(state->proto.iface); + ip = &state->proto.iface->proto_ip; + interface_update_start(state->proto.iface); if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL) addr_ext = blobmsg_get_bool(cur); if ((cur = tb[NOTIFY_IPADDR]) != NULL) - proto_shell_parse_addr_list(state->proto.iface, cur, false, addr_ext); + proto_shell_parse_addr_list(ip, cur, false, addr_ext); if ((cur = tb[NOTIFY_IP6ADDR]) != NULL) - proto_shell_parse_addr_list(state->proto.iface, cur, true, addr_ext); + proto_shell_parse_addr_list(ip, cur, true, addr_ext); if ((cur = tb[NOTIFY_ROUTES]) != NULL) proto_shell_parse_route_list(state->proto.iface, cur, false); @@ -347,12 +286,12 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb) proto_shell_parse_route_list(state->proto.iface, cur, true); if ((cur = tb[NOTIFY_DNS]) != NULL) - interface_add_dns_server_list(state->proto.iface, cur); + interface_add_dns_server_list(ip, cur); if ((cur = tb[NOTIFY_DNS_SEARCH]) != NULL) - interface_add_dns_search_list(state->proto.iface, cur); + interface_add_dns_search_list(ip, cur); - interface_ip_update_complete(state->proto.iface); + interface_update_complete(state->proto.iface); state->proto.proto_event(&state->proto, IFPEV_UP); @@ -401,7 +340,7 @@ proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb) if (!fill_string_list(tb[NOTIFY_ENV], env, ARRAY_SIZE(env))) goto error; - netifd_start_process((const char **) argv, (char **) env, proto_fd, &state->proto_task); + netifd_start_process((const char **) argv, (char **) env, &state->proto_task); return 0; @@ -452,7 +391,7 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr) } } -struct interface_proto_state * +static struct interface_proto_state * proto_shell_attach(const struct proto_handler *h, struct interface *iface, struct blob_attr *attr) { @@ -469,8 +408,14 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface, state->proto.cb = proto_shell_handler; state->setup_timeout.cb = proto_shell_setup_timeout_cb; state->setup_task.cb = proto_shell_setup_cb; + state->setup_task.dir_fd = proto_fd.fd; + state->setup_task.log_prefix = iface->name; state->teardown_task.cb = proto_shell_teardown_cb; + state->teardown_task.dir_fd = proto_fd.fd; + state->teardown_task.log_prefix = iface->name; state->proto_task.cb = proto_shell_task_cb; + state->proto_task.dir_fd = proto_fd.fd; + state->proto_task.log_prefix = iface->name; state->handler = container_of(h, struct proto_shell_handler, proto); return &state->proto; @@ -655,7 +600,7 @@ static void proto_shell_add_script(const char *name) pclose(f); } -void __init proto_shell_init(void) +static void __init proto_shell_init(void) { glob_t g; int main_fd; @@ -673,10 +618,11 @@ void __init proto_shell_init(void) if (chdir("./proto")) goto close_cur; - proto_fd = open(".", O_RDONLY | O_DIRECTORY); - if (proto_fd < 0) + proto_fd.fd = open(".", O_RDONLY | O_DIRECTORY); + if (proto_fd.fd < 0) goto close_cur; + netifd_fd_add(&proto_fd); glob("./*.sh", 0, NULL, &g); for (i = 0; i < g.gl_pathc; i++) proto_shell_add_script(g.gl_pathv[i]);