#include "netifd.h"
#include "interface.h"
+#include "interface-ip.h"
#include "proto.h"
#include "system.h"
-struct v4_addr {
- unsigned int prefix;
- struct in_addr addr;
+enum {
+ OPT_IPADDR,
+ OPT_IP6ADDR,
+ OPT_NETMASK,
+ OPT_GATEWAY,
+ OPT_IP6GW,
+ OPT_DNS,
+ __OPT_MAX,
};
-struct v6_addr {
- unsigned int prefix;
- struct in6_addr addr;
+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 },
+ [OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
};
-enum static_proto_flags {
- STATIC_F_IPV4GW = (1 << 0),
- STATIC_F_IPV6GW = (1 << 1),
+static const union config_param_info static_attr_info[__OPT_MAX] = {
+ [OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
+ [OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
+ [OPT_DNS] = { .type = BLOBMSG_TYPE_STRING },
};
-struct static_proto_settings {
- uint32_t flags;
-
- int n_v4;
- struct v4_addr *v4;
-
- int n_v6;
- struct v6_addr *v6;
-
- struct in_addr ipv4gw;
- struct in6_addr ipv6gw;
+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 interface *iface;
+ struct interface_proto_state proto;
- struct static_proto_settings s;
+ struct blob_attr *config;
};
-static int
-static_handler(struct interface_proto_state *proto,
- enum interface_proto_cmd cmd, bool force)
+static bool
+parse_addr(struct interface *iface, const char *str, bool v6, int mask)
{
- struct static_proto_state *state;
- struct static_proto_settings *ps;
- struct device *dev;
- int ret = 0;
- int i;
+ struct device_addr *addr;
- state = container_of(proto, struct static_proto_state, proto);
- ps = &state->s;
- dev = state->iface->main_dev.dev;
-
- switch (cmd) {
- case PROTO_CMD_SETUP:
- for (i = 0; i < state->s.n_v4; i++) {
- if (ret)
- break;
- ret = system_add_address(dev, AF_INET,
- &ps->v4[i].addr, ps->v4[i].prefix);
- }
- for (i = 0; i < state->s.n_v6; i++) {
- if (ret)
- break;
- ret = system_add_address(dev, AF_INET6,
- &ps->v6[i].addr, ps->v6[i].prefix);
- }
-
- if (!ret)
- return 0;
-
- interface_add_error(state->iface, "proto-static",
- "SET_ADDRESS_FAILED", NULL, 0);
- /* fall through */
-
- case PROTO_CMD_TEARDOWN:
- for (i = 0; i < ps->n_v4; i++)
- system_del_address(dev, AF_INET, &ps->v4[i].addr);
- for (i = 0; i < ps->n_v6; i++)
- system_del_address(dev, AF_INET6, &ps->v6[i].addr);
- break;
+ addr = proto_parse_ip_addr_string(str, v6, mask);
+ if (!addr) {
+ interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
+ return false;
}
- return ret;
+ vlist_add(&iface->proto_addr, &addr->node);
+ return true;
}
-static void
-static_free(struct interface_proto_state *proto)
+static int
+parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask)
{
- struct static_proto_state *state;
+ struct blob_attr *cur;
+ int n_addr = 0;
+ int rem;
+
+ blobmsg_for_each_attr(cur, attr, rem) {
+ n_addr++;
+ if (!parse_addr(iface, blobmsg_data(cur), v6, netmask))
+ return -1;
+ }
- state = container_of(proto, struct static_proto_state, proto);
- free(state);
+ return n_addr;
}
-struct interface_proto_state *
-static_create_state(struct interface *iface, struct static_proto_settings *ps)
+static bool
+parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
{
- struct static_proto_state *state;
- int v4_len = sizeof(struct v4_addr) * ps->n_v4;
- int v6_len = sizeof(struct v6_addr) * ps->n_v6;
- void *next;
+ struct device_route *route;
+ const char *str = blobmsg_data(attr);
+ int af = v6 ? AF_INET6 : AF_INET;
+
+ 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);
- state = calloc(1, sizeof(*state) + v4_len + v6_len);
- state->iface = iface;
- state->proto.free = static_free;
- state->proto.handler = static_handler;
- state->proto.flags = PROTO_FLAG_IMMEDIATE;
- memcpy(&state->s, ps, sizeof(state->s));
+ return true;
+}
- next = (void *) (state + 1);
+static int
+proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
+{
+ struct blob_attr *tb[__OPT_MAX];
+ const char *error;
+ unsigned int netmask = 32;
+ int n_v4 = 0, n_v6 = 0;
- if (ps->n_v4) {
- ps->v4 = next;
- memcpy(next, ps->v4, sizeof(struct v4_addr) * ps->n_v4);
+ blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
- next = ps->v4 + ps->n_v4;
+ if (tb[OPT_NETMASK]) {
+ netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
+ if (netmask > 32) {
+ error = "INVALID_NETMASK";
+ goto error;
+ }
}
- if (ps->n_v6) {
- ps->v6 = next;
- memcpy(next, ps->v6, sizeof(struct v6_addr) * ps->n_v6);
- }
+ if (tb[OPT_IPADDR])
+ n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask);
- return &state->proto;
-}
+ if (tb[OPT_IP6ADDR])
+ n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask);
-static bool
-split_netmask(char *str, unsigned int *netmask)
-{
- char *delim, *err = NULL;
+ if (!n_v4 && !n_v6) {
+ error = "NO_ADDRESS";
+ goto error;
+ }
- delim = strchr(str, '/');
- if (delim) {
- *(delim++) = 0;
+ if (n_v4 < 0 || n_v6 < 0)
+ goto out;
- *netmask = strtoul(delim, &err, 10);
- if (err && *err)
- return false;
+ if (n_v4 && tb[OPT_GATEWAY]) {
+ if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
+ goto out;
}
- return true;
-}
-static int
-parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
-{
- char *astr = alloca(strlen(str) + 1);
-
- strcpy(astr, str);
- if (!split_netmask(astr, netmask))
- return 0;
-
- if (af == AF_INET6) {
- if (*netmask > 128)
- return 0;
- } else {
- if (*netmask > 32)
- return 0;
+ if (n_v6 && tb[OPT_IP6GW]) {
+ if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
+ goto out;
}
- return inet_pton(af, str, addr);
-}
+ if (tb[OPT_DNS])
+ interface_add_dns_server_list(iface, tb[OPT_DNS]);
-static int
-parse_v4(const char *str, struct v4_addr *v4, int netmask)
-{
- v4->prefix = netmask;
- return parse_ip_and_netmask(AF_INET, str, &v4->addr, &v4->prefix);
+ return 0;
+
+error:
+ interface_add_error(iface, "proto-static", error, NULL, 0);
+out:
+ return -1;
}
-static int
-parse_v6(const char *str, struct v6_addr *v6, int netmask)
+static bool
+static_proto_setup(struct static_proto_state *state)
{
- v6->prefix = netmask;
- return parse_ip_and_netmask(AF_INET6, str, &v6->addr, &v6->prefix);
+ return proto_apply_static_settings(state->proto.iface, state->config) == 0;
}
static int
-count_list_entries(struct uci_option *o)
+static_handler(struct interface_proto_state *proto,
+ enum interface_proto_cmd cmd, bool force)
{
- struct uci_element *e;
- int n = 0;
+ struct static_proto_state *state;
+ int ret = 0;
+
+ state = container_of(proto, struct static_proto_state, proto);
- uci_foreach_element(&o->v.list, e)
- n++;
+ switch (cmd) {
+ case PROTO_CMD_SETUP:
+ if (!static_proto_setup(state))
+ return -1;
- return n;
+ break;
+ case PROTO_CMD_TEARDOWN:
+ break;
+ }
+ return ret;
}
-enum {
- OPT_IPADDR,
- OPT_IP6ADDR,
- OPT_NETMASK,
- OPT_GATEWAY,
- OPT_IP6GW,
- __OPT_MAX,
-};
+static void
+static_free(struct interface_proto_state *proto)
+{
+ struct static_proto_state *state;
-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 },
-};
+ 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 uci_option *tb[__OPT_MAX];
- struct uci_element *e;
- struct in_addr ina = {};
- const char *error = NULL;
- int netmask = 32;
- int i;
- struct static_proto_settings ps;
-
- memset(&ps, 0, sizeof(ps));
- uci_parse_section(s, opts, __OPT_MAX, tb);
-
- if (tb[OPT_NETMASK]) {
- if (!inet_aton(tb[OPT_NETMASK]->v.string, &ina)) {
- error = "INVALID_NETMASK";
- goto error;
- }
-
- netmask = 32 - fls(~(ntohl(ina.s_addr)));
- }
+ struct static_proto_state *state;
- if (tb[OPT_IPADDR]) {
- if (tb[OPT_IPADDR]->type == UCI_TYPE_STRING) {
- ps.n_v4 = 1;
- ps.v4 = alloca(sizeof(struct v4_addr));
- if (!parse_v4(tb[OPT_IPADDR]->v.string, ps.v4, netmask))
- goto invalid_addr;
- } else {
- i = 0;
- ps.n_v4 = count_list_entries(tb[OPT_IPADDR]);
- ps.v4 = alloca(sizeof(struct v4_addr) * ps.n_v4);
- uci_foreach_element(&tb[OPT_IPADDR]->v.list, e) {
- if (!parse_v4(e->name, &ps.v4[i++], netmask))
- goto invalid_addr;
- }
- }
- }
+ state = calloc(1, sizeof(*state));
+ if (!state)
+ return NULL;
- if (tb[OPT_IP6ADDR]) {
- if (tb[OPT_IP6ADDR]->type == UCI_TYPE_STRING) {
- ps.n_v6 = 1;
- ps.v6 = alloca(sizeof(struct v6_addr));
- ps.v6->prefix = netmask;
- if (!parse_v6(tb[OPT_IP6ADDR]->v.string, ps.v6, netmask))
- goto invalid_addr;
- } else {
- i = 0;
- ps.n_v6 = count_list_entries(tb[OPT_IP6ADDR]);
- ps.v6 = alloca(sizeof(struct v6_addr) * ps.n_v6);
- uci_foreach_element(&tb[OPT_IP6ADDR]->v.list, e) {
- if (!parse_v6(e->name, &ps.v6[i++], netmask))
- goto invalid_addr;
- }
- }
- }
-
- if (!ps.n_v4 && !ps.n_v6) {
- error = "NO_ADDRESS";
+ state->config = malloc(blob_pad_len(attr));
+ if (!state->config)
goto error;
- }
-
- 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 (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;
- }
-
- return static_create_state(iface, &ps);
+ memcpy(state->config, attr, blob_pad_len(attr));
+ state->proto.free = static_free;
+ state->proto.cb = static_handler;
-invalid_addr:
- error = "INVALID_ADDRESS";
+ return &state->proto;
error:
- interface_add_error(iface, "proto-static", error, NULL, 0);
+ free(state);
return NULL;
}
static struct proto_handler static_proto = {
.name = "static",
+ .flags = PROTO_FLAG_IMMEDIATE,
+ .config_params = &static_attr_list,
.attach = static_attach,
};
projects / project / netifd.git / blobdiff