projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c1e9ba67 MF |
1 | diff -up dhcp-4.3.1b1/client/dhclient.c.JwFUZj dhcp-4.3.1b1/client/dhclient.c |
| 2 | --- dhcp-4.3.1b1/client/dhclient.c.JwFUZj 2014-07-10 17:38:50.511265091 +0200 | |
| 3 | +++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:39:16.164901267 +0200 | |
| 4 | @@ -1281,6 +1281,8 @@ void state_init (cpp) | |
| 78ab9b04 MT |
5 | void *cpp; |
| 6 | { | |
| 7 | struct client_state *client = cpp; | |
| 8 | + enum dhcp_state init_state = client->state; | |
| 9 | + struct timeval tv; | |
| 10 | ||
| 11 | ASSERT_STATE(state, S_INIT); | |
| 12 | ||
| c1e9ba67 | 13 | @@ -1293,9 +1295,18 @@ void state_init (cpp) |
| 78ab9b04 MT |
14 | client -> first_sending = cur_time; |
| 15 | client -> interval = client -> config -> initial_interval; | |
| 16 | ||
| 17 | - /* Add an immediate timeout to cause the first DHCPDISCOVER packet | |
| 18 | - to go out. */ | |
| 19 | - send_discover (client); | |
| 20 | + if (init_state != S_DECLINED) { | |
| 21 | + /* Add an immediate timeout to cause the first DHCPDISCOVER packet | |
| 22 | + to go out. */ | |
| 23 | + send_discover(client); | |
| 24 | + } else { | |
| 25 | + /* We've received an OFFER and it has been DECLINEd by dhclient-script. | |
| 26 | + * wait for a random time between 1 and backoff_cutoff seconds before | |
| 27 | + * trying again. */ | |
| 28 | + tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff); | |
| 29 | + tv . tv_usec = 0; | |
| 30 | + add_timeout(&tv, send_discover, client, 0, 0); | |
| 31 | + } | |
| 32 | } | |
| 33 | ||
| 34 | /* | |
| c1e9ba67 MF |
35 | @@ -1592,6 +1603,7 @@ void bind_lease (client) |
| 36 | "try (declined). Exiting."); | |
| 37 | exit(2); | |
| 38 | } else { | |
| 39 | + client -> state = S_DECLINED; | |
| 40 | state_init(client); | |
| 41 | return; | |
| 42 | } | |
| 43 | @@ -4059,6 +4071,7 @@ void client_location_changed () | |
| 78ab9b04 MT |
44 | case S_INIT: |
| 45 | case S_REBINDING: | |
| 46 | case S_STOPPED: | |
| 47 | + case S_DECLINED: | |
| 48 | break; | |
| 49 | } | |
| 50 | client -> state = S_INIT; | |
| c1e9ba67 MF |
51 | diff -up dhcp-4.3.1b1/includes/dhcpd.h.JwFUZj dhcp-4.3.1b1/includes/dhcpd.h |
| 52 | --- dhcp-4.3.1b1/includes/dhcpd.h.JwFUZj 2014-07-10 17:38:26.941599360 +0200 | |
| 53 | +++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:38:50.526264878 +0200 | |
| 54 | @@ -1087,7 +1087,8 @@ enum dhcp_state { | |
| 78ab9b04 MT |
55 | S_BOUND = 5, |
| 56 | S_RENEWING = 6, | |
| 57 | S_REBINDING = 7, | |
| 58 | - S_STOPPED = 8 | |
| 59 | + S_STOPPED = 8, | |
| 60 | + S_DECLINED = 9 | |
| 61 | }; | |
| 62 | ||
| 63 | /* Authentication and BOOTP policy possibilities (not all values work |