X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=57da77dc0ed2676c089238b0763b8843fdcefc06;hp=53e0ec8eeeaa49cb6859acc9e569bf52764c2f16;hb=aa446207119b958eb51c6b9d447cd03a011927bd;hpb=273550337f70b8b2175875e0c4f0bbd483cfe326 diff --git a/proto-static.c b/proto-static.c index 53e0ec8..57da77d 100644 --- a/proto-static.c +++ b/proto-static.c @@ -7,14 +7,42 @@ #include "netifd.h" #include "interface.h" +#include "interface-ip.h" #include "proto.h" #include "system.h" +enum { + OPT_IPADDR, + OPT_IP6ADDR, + OPT_NETMASK, + OPT_GATEWAY, + OPT_IP6GW, + __OPT_MAX, +}; + +static const struct blobmsg_policy static_attrs[__OPT_MAX] = { + [OPT_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY }, + [OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY }, + [OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING }, + [OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING }, + [OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING }, +}; + +static const union config_param_info static_attr_info[__OPT_MAX] = { + [OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING }, + [OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING }, +}; + +static const struct config_param_list static_attr_list = { + .n_params = __OPT_MAX, + .params = static_attrs, + .info = static_attr_info, +}; + struct static_proto_state { struct interface_proto_state proto; - struct uci_section *section; - struct interface *iface; + struct blob_attr *config; }; static bool @@ -54,75 +82,73 @@ parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) } static bool -parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask) +parse_addr(struct interface *iface, const char *str, bool v6, int mask) { struct device_addr *addr; int af = v6 ? AF_INET6 : AF_INET; addr = calloc(1, sizeof(*addr)); addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4; - addr->ctx = state; addr->mask = mask; if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) { - interface_add_error(state->iface, "proto-static", "INVALID_ADDRESS", &str, 1); + interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1); free(addr); return false; } - interface_add_address(state->iface, addr); + vlist_add(&iface->proto_addr, &addr->node); return true; } static int -parse_address_option(struct static_proto_state *state, struct uci_option *o, bool v6, int netmask) +parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask) { - struct uci_element *e; + struct blob_attr *cur; int n_addr = 0; + int rem; - if (o->type == UCI_TYPE_STRING) { + blobmsg_for_each_attr(cur, attr, rem) { n_addr++; - if (!parse_addr(state, o->v.string, v6, netmask)) + if (!parse_addr(iface, blobmsg_data(cur), v6, netmask)) return -1; - } else { - uci_foreach_element(&o->v.list, e) { - n_addr++; - if (!parse_addr(state, e->name, v6, netmask)) - return -1; - } } return n_addr; } -enum { - OPT_IPADDR, - OPT_IP6ADDR, - OPT_NETMASK, - OPT_GATEWAY, - OPT_IP6GW, - __OPT_MAX, -}; +static bool +parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6) +{ + struct device_route *route; + const char *str = blobmsg_data(attr); + int af = v6 ? AF_INET6 : AF_INET; -static const struct uci_parse_option opts[__OPT_MAX] = { - [OPT_IPADDR] = { .name = "ipaddr" }, - [OPT_IP6ADDR] = { .name = "ip6addr" }, - [OPT_NETMASK] = { .name = "netmask", .type = UCI_TYPE_STRING }, - [OPT_GATEWAY] = { .name = "gateway", .type = UCI_TYPE_STRING }, - [OPT_IP6GW] = { .name = "ip6gw", .type = UCI_TYPE_STRING }, -}; + route = calloc(1, sizeof(*route)); + if (!inet_pton(af, str, &route->nexthop)) { + interface_add_error(iface, "proto-static", + "INVALID_GATEWAY", &str, 1); + free(route); + return false; + } + route->mask = 0; + route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4); + vlist_add(&iface->proto_route, &route->node); -static bool -static_proto_setup(struct static_proto_state *state) + return true; +} + +static int +proto_apply_static_settings(struct interface *iface, struct blob_attr *attr) { - struct uci_option *tb[__OPT_MAX]; + struct blob_attr *tb[__OPT_MAX]; struct in_addr ina; const char *error; int netmask = 32; int n_v4 = 0, n_v6 = 0; - uci_parse_section(state->section, opts, __OPT_MAX, tb); + blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr)); if (tb[OPT_NETMASK]) { - if (!inet_aton(tb[OPT_NETMASK]->v.string, &ina)) { + if (!inet_aton(blobmsg_data(tb[OPT_NETMASK]), &ina)) { error = "INVALID_NETMASK"; goto error; } @@ -131,10 +157,10 @@ static_proto_setup(struct static_proto_state *state) } if (tb[OPT_IPADDR]) - n_v4 = parse_address_option(state, tb[OPT_IPADDR], false, netmask); + n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask); if (tb[OPT_IP6ADDR]) - n_v6 = parse_address_option(state, tb[OPT_IP6ADDR], true, netmask); + n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask); if (!n_v4 && !n_v6) { error = "NO_ADDRESS"; @@ -144,30 +170,28 @@ static_proto_setup(struct static_proto_state *state) if (n_v4 < 0 || n_v6 < 0) goto out; -#if 0 - if (ps.n_v4 && tb[OPT_GATEWAY]) { - if (!inet_pton(AF_INET, tb[OPT_GATEWAY]->v.string, &ps.ipv4gw)) { - error = "INVALID_GATEWAY"; - goto error; - } - ps.flags |= STATIC_F_IPV4GW; + if (n_v4 && tb[OPT_GATEWAY]) { + if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false)) + goto out; } - if (ps.n_v6 && tb[OPT_IP6GW]) { - if (!inet_pton(AF_INET6, tb[OPT_IP6GW]->v.string, &ps.ipv6gw)) { - error = "INVALID_GATEWAY"; - goto error; - } - ps.flags |= STATIC_F_IPV6GW; + if (n_v6 && tb[OPT_IP6GW]) { + if (!parse_gateway_option(iface, tb[OPT_IP6GW], true)) + goto out; } -#endif - return true; + return 0; error: - interface_add_error(state->iface, "proto-static", error, NULL, 0); + interface_add_error(iface, "proto-static", error, NULL, 0); out: - return false; + return -1; +} + +static bool +static_proto_setup(struct static_proto_state *state) +{ + return proto_apply_static_settings(state->proto.iface, state->config) == 0; } static int @@ -181,12 +205,11 @@ static_handler(struct interface_proto_state *proto, switch (cmd) { case PROTO_CMD_SETUP: - if (static_proto_setup(state)) - break; + if (!static_proto_setup(state)) + return -1; - /* fall through */ + break; case PROTO_CMD_TEARDOWN: - interface_del_ctx_addr(state->iface, state); break; } return ret; @@ -198,27 +221,39 @@ static_free(struct interface_proto_state *proto) struct static_proto_state *state; state = container_of(proto, struct static_proto_state, proto); + free(state->config); free(state); } struct interface_proto_state * -static_attach(struct proto_handler *h, struct interface *iface, - struct uci_section *s) +static_attach(const struct proto_handler *h, struct interface *iface, + struct blob_attr *attr) { struct static_proto_state *state; state = calloc(1, sizeof(*state)); - state->iface = iface; - state->section = s; + if (!state) + return NULL; + + state->config = malloc(blob_pad_len(attr)); + if (!state->config) + goto error; + + memcpy(state->config, attr, blob_pad_len(attr)); state->proto.free = static_free; - state->proto.handler = static_handler; - state->proto.flags = PROTO_FLAG_IMMEDIATE; + state->proto.cb = static_handler; return &state->proto; + +error: + free(state); + return NULL; } static struct proto_handler static_proto = { .name = "static", + .flags = PROTO_FLAG_IMMEDIATE, + .config_params = &static_attr_list, .attach = static_attach, };