X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=331eaa197cca5d877b76c266187135c658df1a76;hp=fbed513856c59b2924564a74ff6918d10428cd06;hb=120cd39654a33401423f1b65bb19e12681a6e46f;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516

diff --git a/interface.c b/interface.c
index fbed513..331eaa1 100644
--- a/interface.c
+++ b/interface.c
@@ -32,6 +32,9 @@ enum {
 	IFACE_ATTR_PROTO,
 	IFACE_ATTR_AUTO,
 	IFACE_ATTR_DEFAULTROUTE,
+	IFACE_ATTR_PEERDNS,
+	IFACE_ATTR_DNS,
+	IFACE_ATTR_DNS_SEARCH,
 	IFACE_ATTR_METRIC,
 	IFACE_ATTR_MAX
 };
@@ -41,12 +44,20 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },
+	[IFACE_ATTR_PEERDNS] = { .name = "peerdns", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
+	[IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
+	[IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+};
+
+static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
+	[IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING },
 };
 
 const struct config_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
+	.info = iface_attr_info,
 };
 
 static void
@@ -118,7 +129,7 @@ interface_add_data(struct interface *iface, const struct blob_attr *data)
 	if (!blobmsg_check_attr(data, true))
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	n = calloc(1, sizeof(*data) + blob_pad_len(data));
+	n = calloc(1, sizeof(*n) + blob_pad_len(data));
 	memcpy(n->data, data, blob_pad_len(data));
 	n->node.key = blobmsg_name(data);
 
@@ -390,6 +401,17 @@ interface_init(struct interface *iface, const char *name,
 	iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
 	iface->proto_ip.no_defaultroute =
 		!blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
+	iface->proto_ip.no_dns =
+		!blobmsg_get_bool_default(tb[IFACE_ATTR_PEERDNS], true);
+
+	if ((cur = tb[IFACE_ATTR_DNS]))
+		interface_add_dns_server_list(&iface->config_ip, cur);
+
+	if ((cur = tb[IFACE_ATTR_DNS_SEARCH]))
+		interface_add_dns_search_list(&iface->config_ip, cur);
+
+	if ((cur = tb[IFACE_ATTR_METRIC]))
+		iface->metric = blobmsg_get_u32(cur);
 
 	iface->config_autostart = iface->autostart;
 }
@@ -571,6 +593,13 @@ interface_update_complete(struct interface *iface)
 }
 
 static void
+interface_replace_dns(struct interface_ip_settings *old, struct interface_ip_settings *new)
+{
+	vlist_simple_replace(&new->dns_servers, &old->dns_servers);
+	vlist_simple_replace(&new->dns_search, &old->dns_search);
+}
+
+static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
 	struct blob_attr *old_config = if_old->config;
@@ -617,6 +646,10 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 		interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
 	}
 
+	UPDATE(proto_ip.no_dns);
+	interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
+	interface_write_resolv_conf();
+
 #undef UPDATE
 
 	goto out;