diff options
Diffstat (limited to 'src/dhcp-manager/nm-dhcp-dhcpcd.c')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-dhcpcd.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 8060cc6a..8bbb6e4c 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -36,6 +36,7 @@ #include "nm-utils.h" #include "NetworkManagerUtils.h" #include "nm-dhcp-listener.h" +#include "nm-dhcp-client-logging.h" G_DEFINE_TYPE (NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT) @@ -58,7 +59,8 @@ nm_dhcp_dhcpcd_get_path (void) static gboolean ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last_ip4_address) { - NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); + NMDhcpDhcpcd *self = NM_DHCP_DHCPCD (client); + NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self); GPtrArray *argv = NULL; pid_t pid = -1; GError *error = NULL; @@ -77,7 +79,7 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last dhcpcd_path = nm_dhcp_dhcpcd_get_path (); if (!dhcpcd_path) { - nm_log_warn (LOGD_DHCP4, "dhcpcd could not be found"); + _LOGW ("dhcpcd could not be found"); return FALSE; } @@ -134,17 +136,17 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last g_ptr_array_add (argv, NULL); cmd_str = g_strjoinv (" ", (gchar **) argv->pdata); - nm_log_dbg (LOGD_DHCP4, "running: %s", cmd_str); + _LOGD ("running: %s", cmd_str); g_free (cmd_str); if (g_spawn_async (NULL, (char **) argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, nm_utils_setpgid, NULL, &pid, &error)) { g_assert (pid > 0); - nm_log_info (LOGD_DHCP4, "dhcpcd started with pid %d", pid); + _LOGI ("dhcpcd started with pid %d", pid); nm_dhcp_client_watch_child (client, pid); } else { - nm_log_warn (LOGD_DHCP4, "dhcpcd failed to start. error: '%s'", error->message); + _LOGW ("dhcpcd failed to start, error: '%s'", error->message); g_error_free (error); } @@ -161,21 +163,24 @@ ip6_start (NMDhcpClient *client, NMSettingIP6ConfigPrivacy privacy, const GByteArray *duid) { - nm_log_warn (LOGD_DHCP6, "the dhcpcd backend does not support IPv6."); + NMDhcpDhcpcd *self = NM_DHCP_DHCPCD (client); + + _LOGW ("the dhcpcd backend does not support IPv6"); return FALSE; } static void stop (NMDhcpClient *client, gboolean release, const GByteArray *duid) { - NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); + NMDhcpDhcpcd *self = NM_DHCP_DHCPCD (client); + NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self); /* Chain up to parent */ NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcd_parent_class)->stop (client, release, duid); if (priv->pid_file) { if (remove (priv->pid_file) == -1) - nm_log_dbg (LOGD_DHCP, "Could not remove dhcp pid file \"%s\": %d (%s)", priv->pid_file, errno, g_strerror (errno)); + _LOGD ("could not remove dhcp pid file \"%s\": %d (%s)", priv->pid_file, errno, g_strerror (errno)); } /* FIXME: implement release... */ |