X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=bbe304b1a67ccec9758e81abb1f718a1771a50f8;hp=3c251f4e398aee3a5f0958c0a21634f02332856a;hb=bbfa8c18c8ae086b6fd941e950c466f25c134c17;hpb=f6fb6bee2c29f31d13d0b0288f4f680b6b56e9ba diff --git a/proto-static.c b/proto-static.c index 3c251f4..bbe304b 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,50 +82,44 @@ 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_proto_state *state, 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); free(addr); return false; } - interface_add_address(state->iface, addr); + vlist_add(&state->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_proto_state *state, 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(state, 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; } static bool -parse_gateway_option(struct static_proto_state *state, struct uci_option *o, bool v6) +parse_gateway_option(struct interface_proto_state *state, struct blob_attr *attr, bool v6) { struct device_route *route; - const char *str = o->v.string; + const char *str = blobmsg_data(attr); int af = v6 ? AF_INET6 : AF_INET; route = calloc(1, sizeof(*route)); @@ -109,41 +131,24 @@ parse_gateway_option(struct static_proto_state *state, struct uci_option *o, boo } route->mask = 0; route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4); - interface_add_route(state->iface, route); + vlist_add(&state->iface->proto_route, &route->node); return true; } -enum { - OPT_IPADDR, - OPT_IP6ADDR, - OPT_NETMASK, - OPT_GATEWAY, - OPT_IP6GW, - __OPT_MAX, -}; - -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 }, -}; - -static bool -static_proto_setup(struct static_proto_state *state) +int +proto_apply_static_settings(struct interface_proto_state *state, 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; } @@ -175,12 +180,18 @@ static_proto_setup(struct static_proto_state *state) goto out; } - return true; + return 0; error: interface_add_error(state->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, state->config) == 0; } static int @@ -194,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; @@ -211,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, };