summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/devices/nm-acd-manager.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c
index fe9913c55a..6e7a2a0f61 100644
--- a/src/devices/nm-acd-manager.c
+++ b/src/devices/nm-acd-manager.c
@@ -334,6 +334,8 @@ nm_acd_manager_start_probe (NMAcdManager *self, guint timeout)
if (success)
self->state = STATE_PROBING;
+ nm_assert (!self->channel);
+ nm_assert (self->event_id == 0);
n_acd_get_fd (self->acd, &fd);
self->channel = g_io_channel_unix_new (fd);
self->event_id = g_io_add_watch (self->channel, G_IO_IN, acd_event, self);
@@ -379,6 +381,7 @@ nm_acd_manager_announce_addresses (NMAcdManager *self)
GHashTableIter iter;
AddressInfo *info;
int r;
+ int fd;
gboolean success = TRUE;
r = acd_init (self);
@@ -418,6 +421,13 @@ nm_acd_manager_announce_addresses (NMAcdManager *self)
}
}
+ if (!self->channel) {
+ nm_assert (self->event_id == 0);
+ n_acd_get_fd (self->acd, &fd);
+ self->channel = g_io_channel_unix_new (fd);
+ self->event_id = g_io_add_watch (self->channel, G_IO_IN, acd_event, self);
+ }
+
return success ? 0 : -NME_UNSPEC;
}