+/*
+ * 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 "netifd.h"
#include "interface.h"
+#include "interface-ip.h"
#include "proto.h"
#include "system.h"
struct static_proto_state {
struct interface_proto_state proto;
- struct uci_section *section;
- 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 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
-parse_address_option(struct static_proto_state *state, struct uci_option *o, bool v6, int netmask)
-{
- struct uci_element *e;
- int n_addr = 0;
-
- 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_addr;
-}
-
-enum {
- OPT_IPADDR,
- OPT_IP6ADDR,
- OPT_NETMASK,
- OPT_GATEWAY,
- OPT_IP6GW,
- __OPT_MAX,
-};
-
-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_IP6GW] = { .name = "ip6gw", .type = UCI_TYPE_STRING },
+ struct blob_attr *config;
};
static bool
static_proto_setup(struct static_proto_state *state)
{
- struct uci_option *tb[__OPT_MAX];
- struct in_addr ina;
- const char *error;
- int netmask = 32;
- int n_v4 = 0, n_v6 = 0;
-
- uci_parse_section(state->section, opts, __OPT_MAX, tb);
-
- if (tb[OPT_NETMASK]) {
- if (!inet_aton(tb[OPT_NETMASK]->v.string, &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 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 (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;
-
-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
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);
break;
}
return ret;
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(struct proto_handler *h, struct interface *iface,
- struct uci_section *s)
+static 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));
- state->iface = iface;
- state->section = s;
+ if (!state)
+ return NULL;
+
+ 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;
+
+error:
+ free(state);
+ return NULL;
}
static struct proto_handler static_proto = {
.name = "static",
+ .flags = PROTO_FLAG_IMMEDIATE,
+ .config_params = &proto_ip_attr,
.attach = static_attach,
};
projects / project / netifd.git / blobdiff