+/*
+ * 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>
OPT_BROADCAST,
OPT_GATEWAY,
OPT_IP6GW,
- OPT_DNS,
- OPT_DNS_SEARCH,
__OPT_MAX,
};
[OPT_BROADCAST] = { .name = "broadcast", .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 },
- [OPT_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
};
static const union config_param_info proto_ip_attr_info[__OPT_MAX] = {
[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
- [OPT_DNS] = { .type = BLOBMSG_TYPE_STRING },
};
const struct config_param_list proto_ip_attr = {
.info = proto_ip_attr_info,
};
+enum {
+ ADDR_IPADDR,
+ ADDR_MASK,
+ ADDR_BROADCAST,
+ ADDR_PTP,
+ __ADDR_MAX
+};
+
+static const struct blobmsg_policy proto_ip_addr[__ADDR_MAX] = {
+ [ADDR_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_STRING },
+ [ADDR_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_STRING },
+ [ADDR_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
+ [ADDR_PTP] = { .name = "ptp", .type = BLOBMSG_TYPE_STRING },
+};
unsigned int
parse_netmask_string(const char *str, bool v6)
}
static struct device_addr *
-proto_parse_ip_addr_string(const char *str, bool v6, int mask)
+alloc_device_addr(bool v6, bool ext)
{
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)) {
- free(addr);
- return NULL;
- }
+ if (ext)
+ addr->flags |= DEVADDR_EXTERNAL;
+
return addr;
}
bool ext, uint32_t broadcast)
{
struct device_addr *addr;
+ int af = v6 ? AF_INET6 : AF_INET;
+
+ addr = alloc_device_addr(v6, ext);
+ if (!addr)
+ return false;
- addr = proto_parse_ip_addr_string(str, v6, mask);
- if (!addr) {
+ addr->mask = mask;
+ if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
+ free(addr);
return false;
}
if (broadcast)
addr->broadcast = broadcast;
- if (ext)
- addr->flags |= DEVADDR_EXTERNAL;
-
- vlist_add(&iface->proto_ip.addr, &addr->node);
+ vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
return true;
}
static int
-parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6,
- int netmask, bool ext, uint32_t broadcast)
+parse_static_address_option(struct interface *iface, struct blob_attr *attr,
+ bool v6, int netmask, bool ext, uint32_t broadcast)
{
struct blob_attr *cur;
int n_addr = 0;
return n_addr;
}
+static struct device_addr *
+parse_address_item(struct blob_attr *attr, bool v6, bool ext)
+{
+ struct device_addr *addr;
+ struct blob_attr *tb[__ADDR_MAX];
+ struct blob_attr *cur;
+
+ if (blobmsg_type(attr) != BLOBMSG_TYPE_TABLE)
+ return NULL;
+
+ addr = alloc_device_addr(v6, ext);
+ if (!addr)
+ return NULL;
+
+ blobmsg_parse(proto_ip_addr, __ADDR_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
+
+ addr->mask = v6 ? 128 : 32;
+ if ((cur = tb[ADDR_MASK])) {
+ unsigned int new_mask;
+
+ new_mask = parse_netmask_string(blobmsg_data(cur), v6);
+ if (new_mask > addr->mask)
+ goto error;
+
+ addr->mask = new_mask;
+ }
+
+ cur = tb[ADDR_IPADDR];
+ if (!cur)
+ goto error;
+
+ if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(cur), &addr->addr))
+ goto error;
+
+ if (!v6) {
+ if ((cur = tb[ADDR_BROADCAST]) &&
+ !inet_pton(AF_INET, blobmsg_data(cur), &addr->broadcast))
+ goto error;
+ if ((cur = tb[ADDR_PTP]) &&
+ !inet_pton(AF_INET, blobmsg_data(cur), &addr->point_to_point))
+ goto error;
+ }
+
+ return addr;
+
+error:
+ free(addr);
+ return NULL;
+}
+
+static int
+parse_address_list(struct interface *iface, struct blob_attr *attr, bool v6,
+ bool ext)
+{
+ struct device_addr *addr;
+ struct blob_attr *cur;
+ int n_addr = 0;
+ int rem;
+
+ blobmsg_for_each_attr(cur, attr, rem) {
+ addr = parse_address_item(cur, v6, ext);
+ if (!addr)
+ return -1;
+
+ n_addr++;
+ vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
+ }
+
+ return n_addr;
+}
static bool
parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
}
route->mask = 0;
- route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
- vlist_add(&iface->proto_ip.route, &route->node);
+ route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+ vlist_add(&iface->proto_ip.route, &route->node, &route->flags);
return true;
}
int
-proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
+proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr)
{
struct blob_attr *tb[__OPT_MAX];
+ struct blob_attr *cur;
const char *error;
unsigned int netmask = 32;
int n_v4 = 0, n_v6 = 0;
blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
- if (tb[OPT_NETMASK]) {
- netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
+ if ((cur = tb[OPT_NETMASK])) {
+ netmask = parse_netmask_string(blobmsg_data(cur), false);
if (netmask > 32) {
error = "INVALID_NETMASK";
goto error;
}
}
- if (tb[OPT_BROADCAST]) {
- if (!inet_pton(AF_INET, blobmsg_data(tb[OPT_BROADCAST]), &bcast)) {
+ if ((cur = tb[OPT_BROADCAST])) {
+ if (!inet_pton(AF_INET, blobmsg_data(cur), &bcast)) {
error = "INVALID_BROADCAST";
goto error;
}
}
- if (tb[OPT_IPADDR])
- n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false,
- netmask, ext, bcast.s_addr);
+ if ((cur = tb[OPT_IPADDR]))
+ n_v4 = parse_static_address_option(iface, cur, false,
+ netmask, false, bcast.s_addr);
- if (tb[OPT_IP6ADDR])
- n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true,
- netmask, ext, 0);
+ if ((cur = tb[OPT_IP6ADDR]))
+ n_v6 = parse_static_address_option(iface, cur, true,
+ netmask, false, 0);
if (!n_v4 && !n_v6) {
error = "NO_ADDRESS";
if (n_v4 < 0 || n_v6 < 0)
goto out;
- if (n_v4 && tb[OPT_GATEWAY]) {
- if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
+ if ((cur = tb[OPT_GATEWAY])) {
+ if (n_v4 && !parse_gateway_option(iface, cur, false))
goto out;
}
- if (n_v6 && tb[OPT_IP6GW]) {
- if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
+ if ((cur = tb[OPT_IP6GW])) {
+ if (n_v6 && !parse_gateway_option(iface, cur, true))
goto out;
}
- if (tb[OPT_DNS])
- interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
+ return 0;
+
+error:
+ interface_add_error(iface, "proto", error, NULL, 0);
+out:
+ return -1;
+}
- if (tb[OPT_DNS_SEARCH])
- interface_add_dns_search_list(&iface->proto_ip, tb[OPT_DNS_SEARCH]);
+int
+proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
+{
+ struct blob_attr *tb[__OPT_MAX];
+ struct blob_attr *cur;
+ const char *error;
+ int n_v4 = 0, n_v6 = 0;
+
+ blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
+
+ if ((cur = tb[OPT_IPADDR]))
+ n_v4 = parse_address_list(iface, cur, false, ext);
+
+ if ((cur = tb[OPT_IP6ADDR]))
+ n_v6 = parse_address_list(iface, cur, true, ext);
+
+ if (!n_v4 && !n_v6) {
+ error = "NO_ADDRESS";
+ goto error;
+ }
+
+ if (n_v4 < 0 || n_v6 < 0)
+ goto out;
+
+ if ((cur = tb[OPT_GATEWAY])) {
+ if (n_v4 && !parse_gateway_option(iface, cur, false))
+ goto out;
+ }
+
+ if ((cur = tb[OPT_IP6GW])) {
+ if (n_v6 && !parse_gateway_option(iface, cur, true))
+ goto out;
+ }
return 0;
projects / project / netifd.git / blobdiff