+/*
+ * 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>
if (ext)
addr->flags |= DEVADDR_EXTERNAL;
- vlist_add(&iface->proto_ip.addr, &addr->node, &addr->mask);
+ vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
return true;
}
}
route->mask = 0;
- route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
- vlist_add(&iface->proto_ip.route, &route->node, &route->mask);
+ 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;
if ((cur = tb[OPT_IPADDR]))
n_v4 = parse_address_option(iface, cur, false,
- netmask, ext, bcast.s_addr);
+ 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 ((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,
- netmask, ext, 0);
+ 128, ext, 0);
if (!n_v4 && !n_v6) {
error = "NO_ADDRESS";