We could return from a few more states here.

diff --git a/client.c b/client.c
index f216b39669450f4bbbe65cbc7964054c2b312dbd..0f0994f287588a66c2d058717eab77599747b936 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1731,7 +1731,9 @@ dhcp_run(const struct options *options, int *pid_fd)
                        } else if (fd_hasdata(iface->raw_fd) == 1) {
                                retval = handle_dhcp_packet(state, options);
                                if (retval == 0 &&
-                                   state->state == STATE_REQUESTING)
+                                   (state->state == STATE_REQUESTING ||
+                                    state->state == STATE_INIT ||
+                                    state->state == STATE_PROBING)
                                        /* Fallthrough to handle_timeout */
                                        continue;
 #ifdef ENABLE_ARP