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

dns: log DNS servers at TRACE level

Browse source 
Be more verbose at TRACE level and log the DNS servers associated to
configurations. This will help to debug issues like [0].

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1348887

(cherry picked from commit a5d1db08f8)
This commit is contained in:
Beniamino Galvani 2016-06-24 09:19:42 +02:00
parent 7a343cc981
commit 90dca9e0c9
2 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shared/nm-macros-internal.h
View file

@ -46,6 +46,14 @@ _nm_auto_unset_gvalue_impl (GValue *v)
} }
#define nm_auto_unset_gvalue nm_auto(_nm_auto_unset_gvalue_impl) #define nm_auto_unset_gvalue nm_auto(_nm_auto_unset_gvalue_impl)
static inline void
_nm_auto_free_gstring_impl (GString **str)
{
if (*str)
g_string_free (*str, TRUE);
}
#define nm_auto_free_gstring nm_auto(_nm_auto_free_gstring_impl)
/********************************************************/ /********************************************************/
/* http://stackoverflow.com/a/11172679 */ /* http://stackoverflow.com/a/11172679 */

46
src/dns-manager/nm-dns-manager.c
View file

@ -940,6 +940,44 @@ merge_global_dns_config (NMResolvConfData *rc, NMGlobalDnsConfig *global_conf)
return TRUE; return TRUE;
} }
static const char *
get_nameserver_list (void *config, GString **str)
{
NMIP4Config *ip4;
NMIP6Config *ip6;
guint num, i;
nm_assert (str);
if (*str)
g_string_truncate (*str, 0);
else
*str = g_string_sized_new (64);
if (NM_IS_IP4_CONFIG (config)) {
ip4 = (NMIP4Config *) config;
num = nm_ip4_config_get_num_nameservers (ip4);
for (i = 0; i < num; i++) {
g_string_append (*str,
nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4, i),
NULL));
g_string_append_c (*str, ' ');
}
} else if (NM_IS_IP6_CONFIG (config)) {
ip6 = (NMIP6Config *) config;
num = nm_ip6_config_get_num_nameservers (ip6);
for (i = 0; i < num; i++) {
g_string_append (*str,
nm_utils_inet6_ntop (nm_ip6_config_get_nameserver (ip6, i),
NULL));
g_string_append_c (*str, ' ');
}
} else
g_return_val_if_reached (NULL);
return (*str)->str;
}
static gboolean static gboolean
update_dns (NMDnsManager *self, update_dns (NMDnsManager *self,
gboolean no_caching, gboolean no_caching,
@ -959,6 +997,7 @@ update_dns (NMDnsManager *self,
NMConfigData *data; NMConfigData *data;
NMGlobalDnsConfig *global_config; NMGlobalDnsConfig *global_config;
gs_free NMDnsIPConfigData **plugin_confs = NULL; gs_free NMDnsIPConfigData **plugin_confs = NULL;
nm_auto_free_gstring GString *tmp_gstring = NULL;
g_return_val_if_fail (!error || !*error, FALSE); g_return_val_if_fail (!error || !*error, FALSE);
@ -1015,12 +1054,13 @@ update_dns (NMDnsManager *self,
prev_prio = prio; prev_prio = prio;
_LOGT ("config: %8d %-7s v%c %-16s %s", _LOGT ("config: %8d %-7s v%c %-16s %s: %s",
prio, prio,
_config_type_to_string (current->type), _config_type_to_string (current->type),
v4 ? '4' : '6', v4 ? '4' : '6',
current->iface, current->iface,
skip ? "<SKIP>" : ""); skip ? "<SKIP>" : "",
get_nameserver_list (current->config, &tmp_gstring));
if (!skip) { if (!skip) {
merge_one_ip_config_data (self, &rc, current); merge_one_ip_config_data (self, &rc, current);