De-configure when rebinding fails.

diff --git a/client.c b/client.c
index fe041e3e2510f1ebc7ad59f8903c59229b7a8998..25a412ad6398dbf7a78f1ab7211c1fbcf15713b6 100644 (file)
--- a/client.c
+++ b/client.c
@@ -959,10 +959,7 @@ handle_timeout_fail(struct if_state *state, const struct options *options)
                if (gotlease == 0)
                        return bind_dhcp(state, options);
 
-               if (state->new && !IN_LINKLOCAL(state->new->yiaddr))
-                       reason = "EXPIRE";
-               else
-                       reason = "FAIL";
+               reason = "FAIL";
                drop_config(state, reason, options);
                if (!(state->options & DHCPCD_DAEMONISED))
                        return -1;
@@ -975,6 +972,8 @@ handle_timeout_fail(struct if_state *state, const struct options *options)
                break;
        case STATE_REBINDING:
                logger(LOG_ERR, "failed to rebind, attempting to discover");
+               reason = "EXPIRE";
+               drop_config(state, reason, options);
                state->state = STATE_INIT;
                break;
        default:
@@ -983,8 +982,7 @@ handle_timeout_fail(struct if_state *state, const struct options *options)
        }
 
        get_time(&state->start);
-       tv.tv_usec = 0;
-       if (tv.tv_sec != 0)
+       if (timerisset(&tv))
                timeradd(&state->start, &tv, &state->stop);
 
        /* This effectively falls through into the handle_timeout funtion */