add config state tracking
[project/netifd.git] / proto-static.c
index 4e7c052..a4938f4 100644 (file)
@@ -7,71 +7,44 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
+#include "system.h"
 
-struct v4_addr {
-       struct in_addr addr;
-       unsigned int prefix;
+enum {
+       OPT_IPADDR,
+       OPT_IP6ADDR,
+       OPT_NETMASK,
+       OPT_GATEWAY,
+       OPT_IP6GW,
+       __OPT_MAX,
 };
 
-struct v6_addr {
-       struct in6_addr addr;
-       unsigned int prefix;
+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 },
 };
 
-struct static_proto_state {
-    struct interface_proto_state proto;
-
-       int n_v4;
-       struct v4_addr *v4;
-
-       int n_v6;
-       struct v4_addr *v6;
+static const union config_param_info static_attr_info[__OPT_MAX] = {
+       [OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
+       [OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
 };
 
-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;
-       }
+static const struct config_param_list static_attr_list = {
+       .n_params = __OPT_MAX,
+       .params = static_attrs,
+       .info = static_attr_info,
+};
 
-       if (n_v6) {
-               state->v6 = next;
-               memcpy(state->v6, v6, sizeof(*v6) * n_v6);
-       }
+struct static_proto_state {
+       struct interface_proto_state proto;
 
-       return &state->proto;
-}
+       struct blob_attr *config;
+       struct interface *iface;
+};
 
 static bool
 split_netmask(char *str, unsigned int *netmask)
@@ -109,55 +82,76 @@ parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
        return inet_pton(af, str, addr);
 }
 
-static int
-parse_v4(const char *str, struct v4_addr *v4, int netmask)
+static bool
+parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask)
 {
-       v4->prefix = netmask;
-       return parse_ip_and_netmask(AF_INET, str, &v4->addr, &v4->prefix);
+       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);
+       return true;
 }
 
 static int
-parse_v6(const char *str, struct v6_addr *v6, int netmask)
+parse_address_option(struct static_proto_state *state, struct blob_attr *attr, bool v6, int netmask)
 {
-       v6->prefix = netmask;
-       return parse_ip_and_netmask(AF_INET6, str, &v6->addr, &v6->prefix);
+       struct blob_attr *cur;
+       int n_addr = 0;
+       int rem;
+
+       blobmsg_for_each_attr(cur, attr, rem) {
+               n_addr++;
+               if (!parse_addr(state, blobmsg_data(cur), v6, netmask))
+                       return -1;
+       }
+
+       return n_addr;
 }
 
-enum {
-       OPT_IPADDR,
-       OPT_IP6ADDR,
-       OPT_NETMASK,
-       OPT_GATEWAY,
-       OPT_DNS,
-       __OPT_MAX,
-};
+static bool
+parse_gateway_option(struct static_proto_state *state, struct blob_attr *attr, bool v6)
+{
+       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(state->iface, "proto-static",
+                               "INVALID_GATEWAY", &str, 1);
+               free(route);
+               return false;
+       }
+       route->mask = 0;
+       route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+       interface_add_route(state->iface, route);
 
-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_DNS] = { .name = "dns" },
-};
+       return true;
+}
 
-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 blob_attr *tb[__OPT_MAX];
+       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);
+       blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(state->config),
+               blob_len(state->config));
 
        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;
                }
@@ -165,63 +159,100 @@ static_attach(struct proto_handler *h, struct interface *iface,
                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 {
-                       uci_foreach_element(&tb[OPT_IPADDR]->v.list, e)
-                               n_v4++;
-
-                       i = 0;
-                       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_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 {
-                       uci_foreach_element(&tb[OPT_IP6ADDR]->v.list, e)
-                               n_v6++;
-
-                       i = 0;
-                       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 (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;
        }
 
-       return static_create_state(v4, n_v4, v6, n_v6);
+       if (n_v4 < 0 || n_v6 < 0)
+               goto out;
+
+       if (n_v4 && tb[OPT_GATEWAY]) {
+               if (!parse_gateway_option(state, tb[OPT_GATEWAY], false))
+                       goto out;
+       }
+
+       if (n_v6 && tb[OPT_IP6GW]) {
+               if (!parse_gateway_option(state, tb[OPT_IP6GW], true))
+                       goto out;
+       }
 
-invalid_addr:
-       error = "INVALID_ADDRESS";
+       return true;
 
 error:
-       interface_add_error(iface, "proto-static", error, NULL, 0);
+       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->config);
+       free(state);
+}
+
+struct interface_proto_state *
+static_attach(const struct proto_handler *h, struct interface *iface,
+             struct blob_attr *attr)
+{
+       struct static_proto_state *state;
+
+       state = calloc(1, sizeof(*state));
+       if (!state)
+               return NULL;
+
+       state->iface = iface;
+       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;
+
+       return &state->proto;
+
+error:
+       free(state);
        return NULL;
 }
 
 static struct proto_handler static_proto = {
        .name = "static",
+       .config_params = &static_attr_list,
        .attach = static_attach,
 };