+/*
+ * 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_IPADDR,
OPT_IP6ADDR,
OPT_NETMASK,
+ OPT_BROADCAST,
OPT_GATEWAY,
OPT_IP6GW,
OPT_DNS,
+ OPT_DNS_SEARCH,
__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_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] = {
return inet_pton(af, astr, addr);
}
-struct device_addr *
+static struct device_addr *
proto_parse_ip_addr_string(const char *str, bool v6, int mask)
{
struct device_addr *addr;
}
static bool
-parse_addr(struct interface *iface, const char *str, bool v6, int mask, bool ext)
+parse_addr(struct interface *iface, const char *str, bool v6, int mask,
+ bool ext, uint32_t broadcast)
{
struct device_addr *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)
+parse_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 -1;
n_addr++;
- if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext))
+ if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
+ broadcast))
return -1;
}
}
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;
+ struct in_addr bcast = {};
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_IPADDR])
- n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask, ext);
+ if ((cur = tb[OPT_BROADCAST])) {
+ if (!inet_pton(AF_INET, blobmsg_data(cur), &bcast)) {
+ error = "INVALID_BROADCAST";
+ goto error;
+ }
+ }
+
+ if ((cur = tb[OPT_IPADDR]))
+ n_v4 = parse_address_option(iface, cur, false,
+ netmask, false, bcast.s_addr);
+
+ if ((cur = tb[OPT_IP6ADDR]))
+ n_v6 = parse_address_option(iface, cur, true,
+ netmask, false, 0);
+
+ 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;
+ }
+
+ if ((cur = tb[OPT_DNS]))
+ interface_add_dns_server_list(&iface->proto_ip, cur);
+
+ if ((cur = tb[OPT_DNS_SEARCH]))
+ interface_add_dns_search_list(&iface->proto_ip, cur);
+
+ return 0;
+
+error:
+ interface_add_error(iface, "proto", error, NULL, 0);
+out:
+ return -1;
+}
+
+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;
+ struct in_addr bcast = {};
+
+ blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
- if (tb[OPT_IP6ADDR])
- n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask, ext);
+ if ((cur = tb[OPT_IPADDR]))
+ n_v4 = parse_address_option(iface, cur, false,
+ 32, ext, bcast.s_addr);
+
+ if ((cur = tb[OPT_IP6ADDR]))
+ n_v6 = parse_address_option(iface, cur, true,
+ 128, ext, 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]);
+ if ((cur = tb[OPT_DNS]))
+ interface_add_dns_server_list(&iface->proto_ip, cur);
+
+ if ((cur = tb[OPT_DNS_SEARCH]))
+ interface_add_dns_search_list(&iface->proto_ip, cur);
return 0;
projects / project / netifd.git / blobdiff