netifd: Reload proto on topology change
[project/netifd.git] / proto-static.c
index a4938f4..b492d92 100644 (file)
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.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 blob_attr *config;
-       struct interface *iface;
 };
 
 static bool
-split_netmask(char *str, unsigned int *netmask)
-{
-       char *delim, *err = NULL;
-
-       delim = strchr(str, '/');
-       if (delim) {
-               *(delim++) = 0;
-
-               *netmask = strtoul(delim, &err, 10);
-               if (err && *err)
-                       return false;
-       }
-       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;
-       }
-
-       return inet_pton(af, str, addr);
-}
-
-static bool
-parse_addr(struct static_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);
-       return true;
-}
-
-static int
-parse_address_option(struct static_proto_state *state, struct blob_attr *attr, bool v6, int netmask)
-{
-       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;
-}
-
-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);
-
-       return true;
-}
-
-static bool
 static_proto_setup(struct static_proto_state *state)
 {
-       struct blob_attr *tb[__OPT_MAX];
-       struct in_addr ina;
-       const char *error;
-       int netmask = 32;
-       int n_v4 = 0, n_v6 = 0;
-
-       blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(state->config),
-               blob_len(state->config));
-
-       if (tb[OPT_NETMASK]) {
-               if (!inet_aton(blobmsg_data(tb[OPT_NETMASK]), &ina)) {
-                       error = "INVALID_NETMASK";
-                       goto error;
-               }
-
-               netmask = 32 - fls(~(ntohl(ina.s_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 (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;
-       }
-
-       return true;
-
-error:
-       interface_add_error(state->iface, "proto-static", error, NULL, 0);
-out:
-       return false;
+       return proto_apply_static_ip_settings(state->proto.iface, state->config) == 0;
 }
 
 static int
@@ -202,14 +47,15 @@ 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);
+       case PROTO_CMD_RENEW:
                break;
        }
+
        return ret;
 }
 
@@ -223,7 +69,7 @@ static_free(struct interface_proto_state *proto)
        free(state);
 }
 
-struct interface_proto_state *
+static struct interface_proto_state *
 static_attach(const struct proto_handler *h, struct interface *iface,
              struct blob_attr *attr)
 {
@@ -233,15 +79,13 @@ static_attach(const struct proto_handler *h, struct interface *iface,
        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;
+       state->proto.cb = static_handler;
 
        return &state->proto;
 
@@ -252,7 +96,8 @@ error:
 
 static struct proto_handler static_proto = {
        .name = "static",
-       .config_params = &static_attr_list,
+       .flags = PROTO_FLAG_IMMEDIATE,
+       .config_params = &proto_ip_attr,
        .attach = static_attach,
 };