system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-06 09:04:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp/nettools: don't use GIOChannel to watch plain file descriptor for event fd

Browse source
This commit is contained in:
Thomas Haller 2020-01-01 09:54:23 +01:00
parent e4ab27722a
commit 4b46e3a5fa
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/dhcp/nm-dhcp-nettools.c
View file

@ -49,8 +49,7 @@ typedef struct {
NDhcp4Client *client;
NDhcp4ClientProbe *probe;
NDhcp4ClientLease *lease;
GIOChannel *channel;
guint event_id;
GSource *event_source;
char *lease_file;
} NMDhcpNettoolsPrivate;
@ -1054,7 +1053,7 @@ dhcp4_event_handle (NMDhcpNettools *self,
}
static gboolean
dhcp4_event_cb (GIOChannel *source,
dhcp4_event_cb (int fd,
GIOCondition condition,
gpointer data)
{
@ -1188,8 +1187,14 @@ nettools_create (NMDhcpNettools *self,
client = NULL;
n_dhcp4_client_get_fd (priv->client, &fd);
priv->channel = g_io_channel_unix_new (fd);
priv->event_id = g_io_add_watch (priv->channel, G_IO_IN, dhcp4_event_cb, self);
priv->event_source = nm_g_unix_fd_source_new (fd,
G_IO_IN,
G_PRIORITY_DEFAULT,
dhcp4_event_cb,
self,
NULL);
g_source_attach (priv->event_source, NULL);
return TRUE;
}
@ -1419,8 +1424,7 @@ dispose (GObject *object)
NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE ((NMDhcpNettools *) object);
nm_clear_pointer (&priv->lease_file, g_free);
nm_clear_pointer (&priv->channel, g_io_channel_unref);
nm_clear_g_source (&priv->event_id);
nm_clear_g_source_inst (&priv->event_source);
nm_clear_pointer (&priv->lease, n_dhcp4_client_lease_unref);
nm_clear_pointer (&priv->probe, n_dhcp4_client_probe_free);
nm_clear_pointer (&priv->client, n_dhcp4_client_unref);