Fix timeout.

diff --git a/client.c b/client.c
index a5be48e3c35518ff192d3386cec7f32d84b9d745..e4a1217645aca66865e80e679756ea3ee8dc05cc 100644 (file)
--- a/client.c
+++ b/client.c
@@ -737,12 +737,13 @@ wait_for_packet(struct if_state *state)
 wait_again:
        get_time(&now);
        if (timeout != INFTIM) {
+               if (!timerisset(&state->timeout))
+                       return 0;
                ref = NULL;
                if (timerisset(&state->stop) &&
                    timercmp(&state->stop, &now, >))
                        ref = &state->stop;
-               if (timerisset(&state->timeout) &&
-                   timercmp(&state->timeout, &now, >) &&
+               if (timercmp(&state->timeout, &now, >) &&
                    (!ref || timercmp(&state->timeout, ref, <)))
                        ref = &state->timeout;
                if (!ref)