X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=65ade1268d0b8e55042be667bb8ddbe178e52103;hp=25cd57b89de13fec6727f9cac1c5ff5de7c6616e;hb=7c4108d49d3048d8c14e73d5f366a13ed814df8d;hpb=b7ab9ef01354a2d1c36d7089be366d1684b5ca35 diff --git a/proto-shell.c b/proto-shell.c index 25cd57b..65ade12 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -1,3 +1,5 @@ +#define _GNU_SOURCE + #include #include #include @@ -6,6 +8,9 @@ #include #include +#include +#include + #include #include "netifd.h" @@ -13,7 +18,6 @@ #include "interface-ip.h" #include "proto.h" -static LIST_HEAD(handlers); static int proto_fd; struct proto_shell_handler { @@ -136,9 +140,11 @@ proto_shell_teardown_cb(struct uloop_process *p, int ret) struct proto_shell_state *state; state = container_of(p, struct proto_shell_state, teardown_task); - state->proto.proto_event(&state->proto, IFPEV_DOWN); + if (state->l3_dev.dev) device_remove_user(&state->l3_dev); + + state->proto.proto_event(&state->proto, IFPEV_DOWN); } static void @@ -151,22 +157,140 @@ proto_shell_free(struct interface_proto_state *proto) free(state); } +static void +proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr, + bool v6, bool external) +{ + struct device_addr *addr; + struct blob_attr *cur; + int rem; + + blobmsg_for_each_attr(cur, attr, rem) { + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) { + DPRINTF("Ignore wrong address type: %d\n", blobmsg_type(cur)); + continue; + } + + addr = proto_parse_ip_addr_string(blobmsg_data(cur), v6, v6 ? 32 : 128); + if (!addr) { + DPRINTF("Failed to parse IP address string: %s\n", (char *) blobmsg_data(cur)); + continue; + } + + if (external) + addr->flags |= DEVADDR_EXTERNAL; + + vlist_add(&iface->proto_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_INT32 }, + [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 = blobmsg_get_u32(cur); + 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) +{ + struct blob_attr *cur; + int rem; + + blobmsg_for_each_attr(cur, attr, rem) { + if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE) { + DPRINTF("Ignore wrong route type: %d\n", blobmsg_type(cur)); + continue; + } + + parse_route(iface, cur, v6); + } +} + + enum { NOTIFY_LINK_UP, NOTIFY_IFNAME, + NOTIFY_ADDR_EXT, + NOTIFY_IPADDR, + NOTIFY_IP6ADDR, + NOTIFY_ROUTES, + NOTIFY_ROUTES6, __NOTIFY_LAST }; static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = { [NOTIFY_LINK_UP] = { .name = "link-up", .type = BLOBMSG_TYPE_BOOL }, [NOTIFY_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING }, + [NOTIFY_ADDR_EXT] = { .name = "address-external", .type = BLOBMSG_TYPE_BOOL }, + [NOTIFY_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY }, + [NOTIFY_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY }, + [NOTIFY_ROUTES] = { .name = "routes", .type = BLOBMSG_TYPE_ARRAY }, + [NOTIFY_ROUTES6] = { .name = "routes6", .type = BLOBMSG_TYPE_ARRAY }, }; static int proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr) { struct proto_shell_state *state; - struct blob_attr *tb[__NOTIFY_LAST]; + struct blob_attr *tb[__NOTIFY_LAST], *cur; + bool addr_ext = false; bool up; state = container_of(proto, struct proto_shell_state, proto); @@ -180,15 +304,32 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr) if (!tb[NOTIFY_IFNAME]) return UBUS_STATUS_INVALID_ARGUMENT; - 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; + if (!state->l3_dev.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; + } state->proto.proto_event(&state->proto, IFPEV_UP); } else { state->proto.proto_event(&state->proto, IFPEV_LINK_LOST); } + 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); + + if ((cur = tb[NOTIFY_IP6ADDR]) != NULL) + proto_shell_parse_addr_list(state->proto.iface, cur, true, addr_ext); + + if ((cur = tb[NOTIFY_ROUTES]) != NULL) + proto_shell_parse_route_list(state->proto.iface, cur, false); + + if ((cur = tb[NOTIFY_ROUTES6]) != NULL) + proto_shell_parse_route_list(state->proto.iface, cur, true); + return 0; } @@ -245,11 +386,11 @@ proto_shell_parse_config(struct config_param_list *config, json_object *obj) int str_len = 0; int i; - attrs = calloc(1, sizeof(*attrs)); + config->n_params = json_object_array_length(obj); + attrs = calloc(1, sizeof(*attrs) * config->n_params); if (!attrs) return NULL; - config->n_params = json_object_array_length(obj); config->params = attrs; for (i = 0; i < config->n_params; i++) { json_object *cur, *name, *type; @@ -271,7 +412,7 @@ proto_shell_parse_config(struct config_param_list *config, json_object *obj) if (attrs[i].type > BLOBMSG_TYPE_LAST) goto error; - str_len += strlen(attrs[i].name + 1); + str_len += strlen(attrs[i].name) + 1; } str_buf = malloc(str_len);