fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-08 23:10:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns/resolved: don't repeatedly call nm_ip4_config_get_num_*() to iterate config

Browse source
This commit is contained in:
Thomas Haller 2016-10-14 06:02:13 +02:00
parent 878ed77c6b
commit 5253ab0d0d
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/dns-manager/nm-dns-systemd-resolved.c
View file

@ -163,9 +163,10 @@ update_add_ip6_config (NMDnsSystemdResolved *self,
GVariantBuilder *domains,
const NMIP6Config *config)
{
int i;
guint i, n;
for (i = 0 ; i < nm_ip6_config_get_num_nameservers (config); i++) {
n = nm_ip6_config_get_num_nameservers (config);
for (i = 0 ; i < n; i++) {
const struct in6_addr *ip;
g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)"));
@ -176,13 +177,15 @@ update_add_ip6_config (NMDnsSystemdResolved *self,
g_variant_builder_close (dns);
}
for (i = 0; i < nm_ip6_config_get_num_searches (config); i++) {
add_domain (domains, nm_ip6_config_get_search (config, i),
nm_ip6_config_get_never_default (config));
}
if (nm_ip6_config_get_num_searches (config) == 0) {
for (i = 0; i < nm_ip6_config_get_num_domains (config); i++) {
n = nm_ip6_config_get_num_searches (config);
if (n > 0) {
for (i = 0; i < n; i++) {
add_domain (domains, nm_ip6_config_get_search (config, i),
nm_ip6_config_get_never_default (config));
}
} else {
n = nm_ip6_config_get_num_domains (config);
for (i = 0; i < n; i++) {
add_domain (domains, nm_ip6_config_get_domain (config, i),
nm_ip6_config_get_never_default (config));
}
@ -195,9 +198,10 @@ update_add_ip4_config (NMDnsSystemdResolved *self,
GVariantBuilder *domains,
const NMIP4Config *config)
{
int i;
guint i, n;
for (i = 0 ; i < nm_ip4_config_get_num_nameservers (config); i++) {
n = nm_ip4_config_get_num_nameservers (config);
for (i = 0 ; i < n; i++) {
guint32 ns;
g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)"));
@ -208,13 +212,15 @@ update_add_ip4_config (NMDnsSystemdResolved *self,
g_variant_builder_close (dns);
}
for (i = 0; i < nm_ip4_config_get_num_searches (config); i++) {
add_domain (domains, nm_ip4_config_get_search (config, i),
nm_ip4_config_get_never_default (config));
}
if (nm_ip4_config_get_num_searches (config) == 0) {
for (i = 0; i < nm_ip4_config_get_num_domains (config); i++) {
n = nm_ip4_config_get_num_searches (config);
if (n > 0) {
for (i = 0; i < n; i++) {
add_domain (domains, nm_ip4_config_get_search (config, i),
nm_ip4_config_get_never_default (config));
}
} else {
n = nm_ip4_config_get_num_domains (config);
for (i = 0; i < n; i++) {
add_domain (domains, nm_ip4_config_get_domain (config, i),
nm_ip4_config_get_never_default (config));
}