projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix argument order on replacing dns lists
[project/netifd.git]
/
interface.c
diff --git
a/interface.c
b/interface.c
index
edf9b27
..
6cad26b
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-410,6
+410,9
@@
interface_init(struct interface *iface, const char *name,
if ((cur = tb[IFACE_ATTR_DNS_SEARCH]))
interface_add_dns_search_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;
}
iface->config_autostart = iface->autostart;
}
@@
-590,7
+593,7
@@
interface_update_complete(struct interface *iface)
}
static void
}
static void
-interface_replace_dns(struct interface_ip_settings *
old, struct interface_ip_settings *new
)
+interface_replace_dns(struct interface_ip_settings *
new, struct interface_ip_settings *old
)
{
vlist_simple_replace(&new->dns_servers, &old->dns_servers);
vlist_simple_replace(&new->dns_search, &old->dns_search);
{
vlist_simple_replace(&new->dns_servers, &old->dns_servers);
vlist_simple_replace(&new->dns_search, &old->dns_search);
@@
-645,7
+648,6
@@
interface_change_config(struct interface *if_old, struct interface *if_new)
UPDATE(proto_ip.no_dns);
interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
UPDATE(proto_ip.no_dns);
interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
- interface_replace_dns(&if_old->proto_ip, &if_new->proto_ip);
interface_write_resolv_conf();
#undef UPDATE
interface_write_resolv_conf();
#undef UPDATE