|
 |
fad460 |
diff -up dhcp-4.2.0/client/dhclient.c.backoff dhcp-4.2.0/client/dhclient.c
|
|
|
fad460 |
--- dhcp-4.2.0/client/dhclient.c.backoff 2010-07-21 13:37:03.000000000 +0200
|
|
|
fad460 |
+++ dhcp-4.2.0/client/dhclient.c 2010-07-21 13:38:31.000000000 +0200
|
|
|
fad460 |
@@ -1208,6 +1208,8 @@ void state_init (cpp)
|
|
|
fad460 |
void *cpp;
|
|
|
fad460 |
{
|
|
|
fad460 |
struct client_state *client = cpp;
|
|
|
fad460 |
+ enum dhcp_state init_state = client->state;
|
|
|
fad460 |
+ struct timeval tv;
|
|
|
fad460 |
|
|
|
fad460 |
ASSERT_STATE(state, S_INIT);
|
|
|
fad460 |
|
|
|
fad460 |
@@ -1220,9 +1222,18 @@ void state_init (cpp)
|
|
|
fad460 |
client -> first_sending = cur_time;
|
|
|
fad460 |
client -> interval = client -> config -> initial_interval;
|
|
|
fad460 |
|
|
|
fad460 |
- /* Add an immediate timeout to cause the first DHCPDISCOVER packet
|
|
|
fad460 |
- to go out. */
|
|
|
fad460 |
- send_discover (client);
|
|
|
fad460 |
+ if (init_state != S_DECLINED) {
|
|
|
fad460 |
+ /* Add an immediate timeout to cause the first DHCPDISCOVER packet
|
|
|
fad460 |
+ to go out. */
|
|
|
fad460 |
+ send_discover(client);
|
|
|
fad460 |
+ } else {
|
|
|
fad460 |
+ /* We've received an OFFER and it has been DECLINEd by dhclient-script.
|
|
|
fad460 |
+ * wait for a random time between 1 and backoff_cutoff seconds before
|
|
|
fad460 |
+ * trying again. */
|
|
|
fad460 |
+ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff);
|
|
|
fad460 |
+ tv . tv_usec = 0;
|
|
|
fad460 |
+ add_timeout(&tv, send_discover, client, 0, 0);
|
|
|
fad460 |
+ }
|
|
|
fad460 |
}
|
|
|
fad460 |
|
|
|
fad460 |
/*
|
|
|
fad460 |
@@ -1501,6 +1512,7 @@ void bind_lease (client)
|
|
|
fad460 |
send_decline (client);
|
|
|
fad460 |
destroy_client_lease (client -> new);
|
|
|
fad460 |
client -> new = (struct client_lease *)0;
|
|
|
fad460 |
+ client -> state = S_DECLINED;
|
|
|
fad460 |
state_init (client);
|
|
|
fad460 |
return;
|
|
|
fad460 |
}
|
|
|
fad460 |
@@ -3711,6 +3723,7 @@ void client_location_changed ()
|
|
|
fad460 |
case S_INIT:
|
|
|
fad460 |
case S_REBINDING:
|
|
|
fad460 |
case S_STOPPED:
|
|
|
fad460 |
+ case S_DECLINED:
|
|
|
fad460 |
break;
|
|
|
fad460 |
}
|
|
|
fad460 |
client -> state = S_INIT;
|
|
|
fad460 |
diff -up dhcp-4.2.0/includes/dhcpd.h.backoff dhcp-4.2.0/includes/dhcpd.h
|
|
|
fad460 |
--- dhcp-4.2.0/includes/dhcpd.h.backoff 2010-07-21 13:29:05.000000000 +0200
|
|
|
fad460 |
+++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 13:38:31.000000000 +0200
|
|
|
fad460 |
@@ -1056,7 +1056,8 @@ enum dhcp_state {
|
|
|
fad460 |
S_BOUND = 5,
|
|
|
fad460 |
S_RENEWING = 6,
|
|
|
fad460 |
S_REBINDING = 7,
|
|
|
fad460 |
- S_STOPPED = 8
|
|
|
fad460 |
+ S_STOPPED = 8,
|
|
|
fad460 |
+ S_DECLINED = 9
|
|
|
fad460 |
};
|
|
|
fad460 |
|
|
|
fad460 |
/* Authentication and BOOTP policy possibilities (not all values work
|