diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2016-09-13 14:33:39 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-09-14 13:01:29 +0200 |
| commit | 7f6be657e2dabc185417520de4d0d0de2580c27d (patch) | |
| tree | 69952ac03877a4f0a2ac7ae90481b725a6a0cb2f /interface.c | |
| parent | 83d3a901d3178a8840092b6e4f7f829b89da4ba0 (diff) | |
interface-ip: DNS name server sorting support in resolv.conf.auto
Interface name servers when being written to resolv.conf.auto are sorted
based on the following parameters:
-Primary sorting key is interface dns_metric; name servers having lowest
interface dns_metric are listed first
-Secondary sorting key is interface metric; in case of equal interface
dns_metric name servers having lowest interface metric are listed first
-Finally alphabetical order of the interface names in case of equal
interface dns_metric and metric
In case the resolver queries the multiple servers in the order
listed; sorting is usefull in the following scenarios :
-Name resolving over a main and backup interface
-Assign priority to IPv6 name servers over IPv4 or vice versa
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'interface.c')
| -rw-r--r-- | interface.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/interface.c b/interface.c index 71e2ecc..5870422 100644 --- a/interface.c +++ b/interface.c @@ -35,6 +35,7 @@ enum { IFACE_ATTR_PEERDNS, IFACE_ATTR_DNS, IFACE_ATTR_DNS_SEARCH, + IFACE_ATTR_DNS_METRIC, IFACE_ATTR_METRIC, IFACE_ATTR_INTERFACE, IFACE_ATTR_IP6ASSIGN, @@ -57,6 +58,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [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 }, + [IFACE_ATTR_DNS_METRIC] = { .name = "dns_metric", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 }, [IFACE_ATTR_IP6HINT] = { .name = "ip6hint", .type = BLOBMSG_TYPE_STRING }, @@ -795,6 +797,9 @@ interface_alloc(const char *name, struct blob_attr *config) if ((cur = tb[IFACE_ATTR_DNS_SEARCH])) interface_add_dns_search_list(&iface->config_ip, cur); + if ((cur = tb[IFACE_ATTR_DNS_METRIC])) + iface->dns_metric = blobmsg_get_u32(cur); + if ((cur = tb[IFACE_ATTR_METRIC])) iface->metric = blobmsg_get_u32(cur); @@ -1185,6 +1190,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new) if_old->parent_ifname = if_new->parent_ifname; if_old->proto_handler = if_new->proto_handler; if_old->force_link = if_new->force_link; + if_old->dns_metric = if_new->dns_metric; if_old->proto_ip.no_dns = if_new->proto_ip.no_dns; interface_replace_dns(&if_old->config_ip, &if_new->config_ip); |