netifd: Remove unnecessary default_config check in config_parse_interface

[project/netifd.git] / proto-static.c

diff --git a/proto-static.c b/proto-static.c
index b8f3412..3e33c3d 100644 (file)
--- a/proto-static.c
+++ b/proto-static.c
@@ -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 <string.h>
 #include <stdlib.h>
 #include <stdio.h>


@@ -11,37 +24,6 @@
 #include "proto.h"
 #include "system.h"
 
 #include "proto.h"
 #include "system.h"
 

-enum {
-       OPT_IPADDR,
-       OPT_IP6ADDR,
-       OPT_NETMASK,
-       OPT_GATEWAY,
-       OPT_IP6GW,
-       OPT_DNS,
-       __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 },
-       [OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
-};
-
-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 },
-};
-
-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 static_proto_state {
        struct interface_proto_state proto;
 


@@ -49,113 +31,13 @@ struct static_proto_state {
 };
 
 static bool
 };
 
 static bool

-parse_addr(struct interface *iface, const char *str, bool v6, int mask)
-{
-       struct device_addr *addr;
-
-       addr = proto_parse_ip_addr_string(str, v6, mask);
-       if (!addr) {
-               interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
-               return false;
-       }
-       vlist_add(&iface->proto_addr, &addr->node);
-       return true;
-}
-
-static int
-parse_address_option(struct interface *iface, 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(iface, blobmsg_data(cur), v6, netmask))
-                       return -1;
-       }
-
-       return n_addr;
-}
-
-static bool
-parse_gateway_option(struct interface *iface, 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(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);
-
-       return true;
-}
-
-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;
-
-       blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
-
-       if (tb[OPT_NETMASK]) {
-               netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
-               if (netmask > 32) {
-                       error = "INVALID_NETMASK";
-                       goto error;
-               }
-       }
-
-       if (tb[OPT_IPADDR])
-               n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask);
-
-       if (tb[OPT_IP6ADDR])
-               n_v6 = parse_address_option(iface, 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(iface, tb[OPT_GATEWAY], false))
-                       goto out;
-       }
-
-       if (n_v6 && tb[OPT_IP6GW]) {
-               if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
-                       goto out;
-       }
-
-       if (tb[OPT_DNS])
-               interface_add_dns_server_list(iface, tb[OPT_DNS]);
-
-       return 0;
-
-error:
-       interface_add_error(iface, "proto-static", error, NULL, 0);
-out:
-       return -1;
-}
-
-static bool

 static_proto_setup(struct static_proto_state *state)
 {
 static_proto_setup(struct static_proto_state *state)
 {

-       return proto_apply_static_settings(state->proto.iface, state->config) == 0;
+       struct interface *iface = state->proto.iface;
+       struct device *dev = iface->main_dev.dev;
+
+       interface_set_l3_dev(iface, dev);
+       return proto_apply_static_ip_settings(state->proto.iface, state->config) == 0;

 }
 
 static int
 }
 
 static int


@@ -174,8 +56,10 @@ static_handler(struct interface_proto_state *proto,
 
                break;
        case PROTO_CMD_TEARDOWN:
 
                break;
        case PROTO_CMD_TEARDOWN:

+       case PROTO_CMD_RENEW:

                break;
        }
                break;
        }

+

        return ret;
 }
 
        return ret;
 }
 


@@ -189,7 +73,7 @@ static_free(struct interface_proto_state *proto)
        free(state);
 }
 
        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)
 {
 static_attach(const struct proto_handler *h, struct interface *iface,
              struct blob_attr *attr)
 {


@@ -216,8 +100,9 @@ error:
 
 static struct proto_handler static_proto = {
        .name = "static",
 
 static struct proto_handler static_proto = {
        .name = "static",

-       .flags = PROTO_FLAG_IMMEDIATE,
-       .config_params = &static_attr_list,
+       .flags = PROTO_FLAG_IMMEDIATE |
+                PROTO_FLAG_FORCE_LINK_DEFAULT,
+       .config_params = &proto_ip_attr,

        .attach = static_attach,
 };
 
        .attach = static_attach,
 };