#include "netifd.h"
#include "interface.h"
#include "proto.h"
-
-struct v4_addr {
- struct in_addr addr;
- unsigned int prefix;
-};
-
-struct v6_addr {
- struct in6_addr addr;
- unsigned int prefix;
-};
+#include "system.h"
struct static_proto_state {
- struct interface_proto_state proto;
+ struct interface_proto_state proto;
- int n_v4;
- struct v4_addr *v4;
-
- int n_v6;
- struct v4_addr *v6;
+ struct uci_section *section;
+ struct interface *iface;
};
-static int
-static_handler(struct interface_proto_state *proto,
- enum interface_proto_cmd cmd, bool force)
-{
- return 0;
-}
-
-static void
-static_free(struct interface_proto_state *proto)
-{
- struct static_proto_state *state;
-
- state = container_of(proto, struct static_proto_state, proto);
- free(state);
-}
-
-struct interface_proto_state *
-static_create_state(struct v4_addr *v4, int n_v4, struct v6_addr *v6, int n_v6)
-{
- struct static_proto_state *state;
- int v4_len = sizeof(struct v4_addr) * n_v4;
- int v6_len = sizeof(struct v6_addr) * n_v6;
- void *next;
-
- state = calloc(1, sizeof(*state) + v4_len + v6_len);
- state->proto.free = static_free;
- state->proto.handler = static_handler;
- state->proto.flags = PROTO_FLAG_IMMEDIATE;
- next = (void *) state + 1;
-
- if (n_v4) {
- state->v4 = next;
- memcpy(state->v4, v4, sizeof(*v4) * n_v4);
- next = state->v4 + n_v4;
- }
-
- if (n_v6) {
- state->v6 = next;
- memcpy(state->v6, v6, sizeof(*v6) * n_v6);
- }
-
- return &state->proto;
-}
-
static bool
split_netmask(char *str, unsigned int *netmask)
{
return inet_pton(af, str, addr);
}
-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);
-}
-
-static int
-parse_v6(const char *str, struct v6_addr *v6, int netmask)
+static bool
+parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask)
{
- v6->prefix = netmask;
- return parse_ip_and_netmask(AF_INET6, str, &v6->addr, &v6->prefix);
+ struct interface_addr *addr;
+ int af = v6 ? AF_INET6 : AF_INET;
+
+ addr = calloc(1, sizeof(*addr));
+ addr->flags = v6 ? IFADDR_INET6 : IFADDR_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);
+ return true;
}
static int
-count_list_entries(struct uci_option *o)
+parse_address_option(struct static_proto_state *state, struct uci_option *o, bool v6, int netmask)
{
struct uci_element *e;
- int n = 0;
+ int n_addr = 0;
- uci_foreach_element(&o->v.list, e)
- n++;
+ if (o->type == UCI_TYPE_STRING) {
+ n_addr++;
+ if (!parse_addr(state, o->v.string, 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;
+ return n_addr;
}
enum {
OPT_IP6ADDR,
OPT_NETMASK,
OPT_GATEWAY,
- OPT_DNS,
+ OPT_IP6GW,
__OPT_MAX,
};
[OPT_IP6ADDR] = { .name = "ip6addr" },
[OPT_NETMASK] = { .name = "netmask", .type = UCI_TYPE_STRING },
[OPT_GATEWAY] = { .name = "gateway", .type = UCI_TYPE_STRING },
- [OPT_DNS] = { .name = "dns" },
+ [OPT_IP6GW] = { .name = "ip6gw", .type = UCI_TYPE_STRING },
};
-struct interface_proto_state *
-static_attach(struct proto_handler *h, struct interface *iface,
- struct uci_section *s)
+static bool
+static_proto_setup(struct static_proto_state *state)
{
struct uci_option *tb[__OPT_MAX];
- struct uci_element *e;
- struct v4_addr *v4 = NULL;
- struct v6_addr *v6 = NULL;
- int n_v4 = 0, n_v6 = 0;
- struct in_addr ina = {};
- const char *error = NULL;
+ struct in_addr ina;
+ const char *error;
int netmask = 32;
- int i;
+ int n_v4 = 0, n_v6 = 0;
- uci_parse_section(s, opts, __OPT_MAX, tb);
+ uci_parse_section(state->section, opts, __OPT_MAX, tb);
if (tb[OPT_NETMASK]) {
if (!inet_aton(tb[OPT_NETMASK]->v.string, &ina)) {
netmask = 32 - fls(~(ntohl(ina.s_addr)));
}
- if (tb[OPT_IPADDR]) {
- if (tb[OPT_IPADDR]->type == UCI_TYPE_STRING) {
- n_v4 = 1;
- v4 = alloca(sizeof(*v4));
- if (!parse_v4(tb[OPT_IPADDR]->v.string, v4, netmask))
- goto invalid_addr;
- } else {
- i = 0;
- n_v4 = count_list_entries(tb[OPT_IPADDR]);
- v4 = alloca(sizeof(*v4) * n_v4);
- uci_foreach_element(&tb[OPT_IPADDR]->v.list, e) {
- if (!parse_v4(e->name, &v4[i++], netmask))
- goto invalid_addr;
- }
+ if (tb[OPT_IPADDR])
+ n_v4 = parse_address_option(state, tb[OPT_IPADDR], false, netmask);
+
+ if (tb[OPT_IP6ADDR])
+ n_v6 = parse_address_option(state, tb[OPT_IP6ADDR], true, netmask);
+
+ if (!n_v4 && !n_v6) {
+ error = "NO_ADDRESS";
+ goto error;
+ }
+
+ 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 (tb[OPT_IP6ADDR]) {
- if (tb[OPT_IP6ADDR]->type == UCI_TYPE_STRING) {
- n_v6 = 1;
- v6 = alloca(sizeof(*v6));
- v6->prefix = netmask;
- if (!parse_v6(tb[OPT_IP6ADDR]->v.string, v6, netmask))
- goto invalid_addr;
- } else {
- i = 0;
- n_v6 = count_list_entries(tb[OPT_IP6ADDR]);
- v6 = alloca(sizeof(*v6) * n_v6);
- uci_foreach_element(&tb[OPT_IP6ADDR]->v.list, e) {
- if (!parse_v6(e->name, &v6[i++], netmask))
- goto invalid_addr;
- }
+ 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;
}
+#endif
+ return true;
- if (!n_v4 && !n_v6) {
- error = "NO_ADDRESS";
- goto error;
+error:
+ interface_add_error(state->iface, "proto-static", error, NULL, 0);
+out:
+ return false;
+}
+
+static int
+static_handler(struct interface_proto_state *proto,
+ enum interface_proto_cmd cmd, bool force)
+{
+ struct static_proto_state *state;
+ int ret = 0;
+
+ state = container_of(proto, struct static_proto_state, proto);
+
+ switch (cmd) {
+ case PROTO_CMD_SETUP:
+ if (static_proto_setup(state))
+ break;
+
+ /* fall through */
+ case PROTO_CMD_TEARDOWN:
+ interface_del_ctx_addr(state->iface, state);
+ break;
}
+ return ret;
+}
+
+static void
+static_free(struct interface_proto_state *proto)
+{
+ struct static_proto_state *state;
+
+ state = container_of(proto, struct static_proto_state, proto);
+ free(state);
+}
- return static_create_state(v4, n_v4, v6, n_v6);
+struct interface_proto_state *
+static_attach(struct proto_handler *h, struct interface *iface,
+ struct uci_section *s)
+{
+ struct static_proto_state *state;
-invalid_addr:
- error = "INVALID_ADDRESS";
+ state = calloc(1, sizeof(*state));
+ state->iface = iface;
+ state->section = s;
+ state->proto.free = static_free;
+ state->proto.handler = static_handler;
+ state->proto.flags = PROTO_FLAG_IMMEDIATE;
-error:
- interface_add_error(iface, "proto-static", error, NULL, 0);
- return NULL;
+ return &state->proto;
}
static struct proto_handler static_proto = {
projects / project / netifd.git / blobdiff