summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2020-02-07 11:00:48 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2020-02-11 09:26:07 +0100
commit45521b1b3872e1f95cb3863f0eae0f8e2408ea42 (patch)
tree2eebb25d47205f4adc6ef53888649cc330f30748
parent43016d6ebd232bb8285f3adb386041100679f362 (diff)
dhcp: nettools: move to failed state if event dispatch fails
-rw-r--r--src/dhcp/nm-dhcp-nettools.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 23bdefabb..d3a995626 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1063,8 +1063,18 @@ dhcp4_event_cb (int fd,
int r;
r = n_dhcp4_client_dispatch (priv->client);
- if (r < 0)
- return G_SOURCE_CONTINUE;
+ if (r < 0) {
+ /* FIXME: if any operation (e.g. send()) fails during the
+ * dispatch, n-dhcp4 returns an error without arming timers
+ * or progressing state, so the only reasonable thing to do
+ * is to move to failed state so that the client will be
+ * restarted. Ideally n-dhcp4 should retry failed operations
+ * a predefined number of times (possibly infinite).
+ */
+ _LOGE ("error %d dispatching events", r);
+ nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
+ return G_SOURCE_REMOVE;
+ }
while (!n_dhcp4_client_pop_event (priv->client, &event) && event) {
dhcp4_event_handle (self, event);