X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=proto-shell.c;h=3b5311ce17a228f55e4ef90eb415f9e40a823e7e;hb=8f689d09814add5e1b22577cc104e2eb5e16c66f;hp=68af69ba23a2cf6e4a9e9ac85b7d19e9dd38a626;hpb=b314737e9a0f0df710ba5e8691882cd7d42faaf5;p=project%2Fnetifd.git diff --git a/proto-shell.c b/proto-shell.c index 68af69b..3b5311c 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -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,7 +240,9 @@ 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; + int dev_create = 1; bool addr_ext = false; bool up; @@ -319,26 +255,33 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb) return 0; } + if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL) { + addr_ext = blobmsg_get_bool(cur); + if (addr_ext) + dev_create = 2; + } + 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); + device_get(blobmsg_data(tb[NOTIFY_IFNAME]), dev_create)); state->proto.iface->l3_dev = &state->l3_dev; + device_claim(&state->l3_dev); } - interface_ip_update_start(state->proto.iface); - - if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL) - addr_ext = blobmsg_get_bool(cur); + ip = &state->proto.iface->proto_ip; + interface_update_start(state->proto.iface); 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 +290,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); @@ -389,8 +332,8 @@ out: static int proto_shell_run_command(struct proto_shell_state *state, struct blob_attr **tb) { - char *argv[64]; - char *env[32]; + static char *argv[64]; + static char *env[32]; if (!tb[NOTIFY_COMMAND]) goto error; @@ -452,7 +395,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) { @@ -612,9 +555,9 @@ static void proto_shell_add_script(const char *name) struct json_tokener *tok = NULL; json_object *obj; static char buf[512]; - char *start, *end, *cmd; + char *start, *cmd; FILE *f; - int buflen, len; + int len; #define DUMP_SUFFIX " '' dump" @@ -626,33 +569,25 @@ static void proto_shell_add_script(const char *name) return; do { - buflen = fread(buf, 1, sizeof(buf) - 1, f); - if (buflen <= 0) + start = fgets(buf, sizeof(buf), f); + if (!start) continue; - start = buf; - len = buflen; - do { - end = memchr(start, '\n', len); - if (end) - len = end - start; - - if (!tok) - tok = json_tokener_new(); - - obj = json_tokener_parse_ex(tok, start, len); - if (!is_error(obj)) { - proto_shell_add_handler(name, obj); - json_object_put(obj); - json_tokener_free(tok); - tok = NULL; - } - - if (end) { - start = end + 1; - len = buflen - (start - buf); - } - } while (len > 0); + len = strlen(start); + + if (!tok) + tok = json_tokener_new(); + + obj = json_tokener_parse_ex(tok, start, len); + if (!is_error(obj)) { + proto_shell_add_handler(name, obj); + json_object_put(obj); + json_tokener_free(tok); + tok = NULL; + } else if (start[len - 1] == '\n') { + json_tokener_free(tok); + tok = NULL; + } } while (!feof(f) && !ferror(f)); if (tok) @@ -661,7 +596,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;