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

dhcp: clear watch_id in child-watch callback

Browse Source
This commit is contained in:
Thomas Haller
2016-01-20 10:26:59 +01:00
parent 701d98acc5
commit a99a0d194d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dhcp-manager/nm-dhcp-client.c
View File

@@ -361,6 +361,9 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data)
guint64 log_domain; guint64 log_domain;
guint ip_ver; guint ip_ver;
g_return_if_fail (priv->watch_id);
priv->watch_id = 0;
log_domain = priv->ipv6 ? LOGD_DHCP6 : LOGD_DHCP4; log_domain = priv->ipv6 ? LOGD_DHCP6 : LOGD_DHCP4;
ip_ver = priv->ipv6 ? 6 : 4; ip_ver = priv->ipv6 ? 6 : 4;
@@ -402,7 +405,7 @@ nm_dhcp_client_watch_child (NMDhcpClient *self, pid_t pid)
priv->timeout_id = g_timeout_add_seconds (priv->timeout, priv->timeout_id = g_timeout_add_seconds (priv->timeout,
daemon_timeout, daemon_timeout,
self); self);
g_assert (priv->watch_id == 0); g_return_if_fail (priv->watch_id == 0);
priv->watch_id = g_child_watch_add (pid, daemon_watch_cb, self); priv->watch_id = g_child_watch_add (pid, daemon_watch_cb, self);
} }