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

dhcp: use GSource for watching child process instead of numeric source id

Browse source 
(cherry picked from commit c8542a5d50)
(cherry picked from commit 3f1b53c851)
This commit is contained in:
Thomas Haller 2022-05-04 21:52:23 +02:00 • committed by Beniamino Galvani
parent 6c2d34cd4f
commit c1fee605d8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/dhcp/nm-dhcp-client.c
View file

@ -43,9 +43,9 @@ typedef struct _NMDhcpClientPrivate {
const NML3ConfigData *l3cd; const NML3ConfigData *l3cd;
GSource *no_lease_timeout_source; GSource *no_lease_timeout_source;
GSource *ipv6_lladdr_timeout_source; GSource *ipv6_lladdr_timeout_source;
GSource *watch_source;
GBytes *effective_client_id; GBytes *effective_client_id;
pid_t pid; pid_t pid;
guint watch_id;
NMDhcpState state; NMDhcpState state;
bool iaid_explicit : 1; bool iaid_explicit : 1;
bool is_stopped : 1; bool is_stopped : 1;
@ -181,7 +181,7 @@ watch_cleanup(NMDhcpClient *self)
{ {
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
nm_clear_g_source(&priv->watch_id); nm_clear_g_source_inst(&priv->watch_source);
} }
void void
@ -389,8 +389,9 @@ daemon_watch_cb(GPid pid, int status, gpointer user_data)
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
gs_free char *desc = NULL; gs_free char *desc = NULL;
g_return_if_fail(priv->watch_id); g_return_if_fail(priv->watch_source);
priv->watch_id = 0;
priv->watch_source = NULL;
_LOGI("client pid %d %s", pid, (desc = nm_utils_get_process_exit_status_desc(status))); _LOGI("client pid %d %s", pid, (desc = nm_utils_get_process_exit_status_desc(status)));
@ -407,8 +408,8 @@ nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid)
g_return_if_fail(priv->pid == -1); g_return_if_fail(priv->pid == -1);
priv->pid = pid; priv->pid = pid;
g_return_if_fail(priv->watch_id == 0); g_return_if_fail(!priv->watch_source);
priv->watch_id = g_child_watch_add(pid, daemon_watch_cb, self); priv->watch_source = nm_g_child_watch_add_source(pid, daemon_watch_cb, self);
} }
void void