rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix dhclient-decline-backoff.patch (#562854)

Browse Source
This commit is contained in:
Jiří Popelka 2010-02-08 16:01:45 +00:00
parent 152a4960a9
commit 465f750ab6
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dhcp-4.1.1-dhclient-decline-backoff.patch
View File

@ -1,15 +1,16 @@
diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c
--- dhcp-4.1.1/client/dhclient.c.backoff 2010-01-20 17:14:37.000000000 +0100 --- dhcp-4.1.1/client/dhclient.c.backoff 2010-02-08 16:41:52.000000000 +0100
+++ dhcp-4.1.1/client/dhclient.c 2010-01-20 17:14:37.000000000 +0100 +++ dhcp-4.1.1/client/dhclient.c 2010-02-08 16:43:56.000000000 +0100
@@ -1187,6 +1187,7 @@ void state_init (cpp) @@ -1187,6 +1187,8 @@ void state_init (cpp)
void *cpp; void *cpp;
{ {
struct client_state *client = cpp; struct client_state *client = cpp;
+ enum dhcp_state init_state = client->state; + enum dhcp_state init_state = client->state;
+ struct timeval tv;
ASSERT_STATE(state, S_INIT); ASSERT_STATE(state, S_INIT);
@@ -1199,9 +1200,16 @@ void state_init (cpp) @@ -1199,9 +1201,18 @@ void state_init (cpp)
client -> first_sending = cur_time; client -> first_sending = cur_time;
client -> interval = client -> config -> initial_interval; client -> interval = client -> config -> initial_interval;
@ -24,12 +25,14 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c
+ /* We've received an OFFER and it has been DECLINEd by dhclient-script. + /* We've received an OFFER and it has been DECLINEd by dhclient-script.
+ * wait for a random time between 1 and backoff_cutoff seconds before + * wait for a random time between 1 and backoff_cutoff seconds before
+ * trying again. */ + * trying again. */
+ add_timeout(cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff), send_discover, client, 0, 0); + tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff);
+ tv . tv_usec = 0;
+ add_timeout(&tv, send_discover, client, 0, 0);
+ } + }
} }
/* /*
@@ -1480,6 +1488,7 @@ void bind_lease (client) @@ -1480,6 +1491,7 @@ void bind_lease (client)
send_decline (client); send_decline (client);
destroy_client_lease (client -> new); destroy_client_lease (client -> new);
client -> new = (struct client_lease *)0; client -> new = (struct client_lease *)0;
@ -37,7 +40,7 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c
state_init (client); state_init (client);
return; return;
} }
@@ -3689,6 +3698,7 @@ void client_location_changed () @@ -3689,6 +3701,7 @@ void client_location_changed ()
case S_INIT: case S_INIT:
case S_REBINDING: case S_REBINDING:
case S_STOPPED: case S_STOPPED:
@ -46,8 +49,8 @@ diff -up dhcp-4.1.1/client/dhclient.c.backoff dhcp-4.1.1/client/dhclient.c
} }
client -> state = S_INIT; client -> state = S_INIT;
diff -up dhcp-4.1.1/includes/dhcpd.h.backoff dhcp-4.1.1/includes/dhcpd.h diff -up dhcp-4.1.1/includes/dhcpd.h.backoff dhcp-4.1.1/includes/dhcpd.h
--- dhcp-4.1.1/includes/dhcpd.h.backoff 2010-01-20 17:14:37.000000000 +0100 --- dhcp-4.1.1/includes/dhcpd.h.backoff 2010-02-08 16:41:52.000000000 +0100
+++ dhcp-4.1.1/includes/dhcpd.h 2010-01-20 17:14:37.000000000 +0100 +++ dhcp-4.1.1/includes/dhcpd.h 2010-02-08 16:41:52.000000000 +0100
@@ -1017,7 +1017,8 @@ enum dhcp_state { @@ -1017,7 +1017,8 @@ enum dhcp_state {
S_BOUND = 5, S_BOUND = 5,
S_RENEWING = 6, S_RENEWING = 6,

5
dhcp.spec
View File

@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: %{basever} Version: %{basever}
Release: 4%{?dist} Release: 5%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -500,6 +500,9 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Mon Feb 08 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-5
- Fix dhclient-decline-backoff.patch (#562854)
* Fri Feb 05 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-4 * Fri Feb 05 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-4
- Fix dhclient-script to delete address which the client is going to release - Fix dhclient-script to delete address which the client is going to release
as soon as it begins the Release message exchange process (#559142) as soon as it begins the Release message exchange process (#559142)