add .gitignore

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

diff --git a/proto-static.c b/proto-static.c
index 3868ab7..17cff0a 100644 (file)
--- a/proto-static.c
+++ b/proto-static.c
@@ -46,61 +46,21 @@ struct static_proto_state {
 };
 
 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 interface_proto_state *state, const char *str, bool v6, int mask)
+parse_addr(struct interface *iface, 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->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);
+       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(&state->iface->proto_addr, &addr->node);
+       vlist_add(&iface->proto_addr, &addr->node);
        return true;
 }
 
 static int
-parse_address_option(struct interface_proto_state *state, struct blob_attr *attr, bool v6, int netmask)
+parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask)
 {
        struct blob_attr *cur;
        int n_addr = 0;
@@ -108,7 +68,7 @@ parse_address_option(struct interface_proto_state *state, struct blob_attr *attr
 
        blobmsg_for_each_attr(cur, attr, rem) {
                n_addr++;
-               if (!parse_addr(state, blobmsg_data(cur), v6, netmask))
+               if (!parse_addr(iface, blobmsg_data(cur), v6, netmask))
                        return -1;
        }
 
@@ -116,7 +76,7 @@ parse_address_option(struct interface_proto_state *state, struct blob_attr *attr
 }
 
 static bool
-parse_gateway_option(struct interface_proto_state *state, struct blob_attr *attr, bool v6)
+parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
 {
        struct device_route *route;
        const char *str = blobmsg_data(attr);
@@ -124,20 +84,20 @@ parse_gateway_option(struct interface_proto_state *state, struct blob_attr *attr
 
        route = calloc(1, sizeof(*route));
        if (!inet_pton(af, str, &route->nexthop)) {
-               interface_add_error(state->iface, "proto-static",
+               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(&state->iface->proto_route, &route->node);
+       vlist_add(&iface->proto_route, &route->node);
 
        return true;
 }
 
-int
-proto_apply_static_settings(struct interface_proto_state *state, struct blob_attr *attr)
+static int
+proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
 {
        struct blob_attr *tb[__OPT_MAX];
        struct in_addr ina;
@@ -157,10 +117,10 @@ proto_apply_static_settings(struct interface_proto_state *state, struct blob_att
        }
 
        if (tb[OPT_IPADDR])
-               n_v4 = parse_address_option(state, tb[OPT_IPADDR], false, netmask);
+               n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask);
 
        if (tb[OPT_IP6ADDR])
-               n_v6 = parse_address_option(state, tb[OPT_IP6ADDR], true, netmask);
+               n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask);
 
        if (!n_v4 && !n_v6) {
                error = "NO_ADDRESS";
@@ -171,19 +131,19 @@ proto_apply_static_settings(struct interface_proto_state *state, struct blob_att
                goto out;
 
        if (n_v4 && tb[OPT_GATEWAY]) {
-               if (!parse_gateway_option(state, tb[OPT_GATEWAY], false))
+               if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
                        goto out;
        }
 
        if (n_v6 && tb[OPT_IP6GW]) {
-               if (!parse_gateway_option(state, tb[OPT_IP6GW], true))
+               if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
                        goto out;
        }
 
        return 0;
 
 error:
-       interface_add_error(state->iface, "proto-static", error, NULL, 0);
+       interface_add_error(iface, "proto-static", error, NULL, 0);
 out:
        return -1;
 }
@@ -191,7 +151,7 @@ out:
 static bool
 static_proto_setup(struct static_proto_state *state)
 {
-       return proto_apply_static_settings(&state->proto, state->config) == 0;
+       return proto_apply_static_settings(state->proto.iface, state->config) == 0;
 }
 
 static int
@@ -205,10 +165,10 @@ 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:
                break;
        }
@@ -241,8 +201,7 @@ static_attach(const struct proto_handler *h, struct interface *iface,
 
        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;
 
@@ -253,6 +212,7 @@ error:
 
 static struct proto_handler static_proto = {
        .name = "static",
+       .flags = PROTO_FLAG_IMMEDIATE,
        .config_params = &static_attr_list,
        .attach = static_attach,
 };