colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nettools: enable logging

Browse Source
This commit is contained in:
Beniamino Galvani
2019-11-13 10:43:50 +01:00
parent 72270b9e0e
commit 97a8785148
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
shared/nm-glib-aux/nm-logging-fwd.h
View File

@@ -112,6 +112,19 @@ nm_log_level_from_syslog (int syslog_level)
} }
} }
static inline int
nm_log_level_to_syslog (NMLogLevel nm_level)
{
switch (nm_level) {
case LOGL_ERR: return 3; /* LOG_ERR */
case LOGL_WARN: return 4; /* LOG_WARN */
case LOGL_INFO: return 5; /* LOG_NOTICE */
case LOGL_DEBUG: return 6; /* LOG_INFO */
case LOGL_TRACE: return 7; /* LOG_DEBUG */
default: return 0; /* LOG_EMERG */
}
}
/*****************************************************************************/ /*****************************************************************************/
struct timespec; struct timespec;

22
src/dhcp/nm-dhcp-nettools.c
View File

@@ -1053,6 +1053,26 @@ dhcp4_event_cb (GIOChannel *source,
return G_SOURCE_CONTINUE; return G_SOURCE_CONTINUE;
} }
static void
nettools_log (int level, void *data, const char *fmt, ...)
{
NMDhcpNettools *self = data;
NMLogLevel nm_level;
gs_free char *msg = NULL;
va_list ap;
nm_level = nm_log_level_from_syslog (level);
if (nm_logging_enabled (nm_level, LOGD_DHCP4)) {
va_start (ap, fmt);
msg = g_strdup_vprintf (fmt, ap);
va_end (ap);
nm_log (nm_level, LOGD_DHCP4, NULL , NULL,
"dhcp4 (%s): %s",
nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self)),
msg);
}
}
static gboolean static gboolean
nettools_create (NMDhcpNettools *self, nettools_create (NMDhcpNettools *self,
const char *dhcp_anycast_addr, const char *dhcp_anycast_addr,
@@ -1122,6 +1142,8 @@ nettools_create (NMDhcpNettools *self,
return FALSE; return FALSE;
} }
n_dhcp4_client_config_set_log_level (config, nm_log_level_to_syslog (nm_logging_get_level (LOGD_DHCP4)));
n_dhcp4_client_config_set_log_func (config, nettools_log, self);
n_dhcp4_client_config_set_ifindex (config, nm_dhcp_client_get_ifindex (NM_DHCP_CLIENT (self))); n_dhcp4_client_config_set_ifindex (config, nm_dhcp_client_get_ifindex (NM_DHCP_CLIENT (self)));
n_dhcp4_client_config_set_transport (config, transport); n_dhcp4_client_config_set_transport (config, transport);
n_dhcp4_client_config_set_mac (config, hwaddr_arr, hwaddr_len); n_dhcp4_client_config_set_mac (config, hwaddr_arr, hwaddr_len);