diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-07-22 13:23:39 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-07-22 13:23:39 +0000 |
| commit | 7fad611b8a299ed7596f4f792281dfe786fd4c8e (patch) | |
| tree | 172dd478f3ff73615694550097850da07184e2fa /sbin | |
| parent | 4161bec68705770fe45e517d7a91d5302d81020c (diff) | |
Actually DECLINE and delete unused offers. Don't just say so in a comment.
In situations where >1 offer is received this will eliminate unbounded memory
growth and make us a more polite netizen. In some corner cases it might
prevent reuse of inappropriate older offers.
ok millert@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 691f23ae71f..804fc095b7b 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.377 2016/07/21 09:58:55 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.378 2016/07/22 13:23:38 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -794,22 +794,25 @@ state_init(void) void state_selecting(void) { - struct client_lease *picked; + struct client_lease *lease, *picked; cancel_timeout(); - /* Take the first valid DHCPOFFER, discard the rest. */ - picked = NULL; - while (!TAILQ_EMPTY(&client->offered_leases) && !picked) { - picked = TAILQ_FIRST(&client->offered_leases); - TAILQ_REMOVE(&client->offered_leases, picked, next); - if (picked->is_invalid) { - make_decline(picked); - send_decline(); - free_client_lease(picked); - picked = NULL; + /* Take the first valid DHCPOFFER. */ + TAILQ_FOREACH_SAFE(picked, &client->offered_leases, next, lease) { + if (picked->is_invalid == 0) { + TAILQ_REMOVE(&client->offered_leases, picked, next); + break; } } + /* DECLINE the rest of the offers. */ + while (!TAILQ_EMPTY(&client->offered_leases)) { + lease = TAILQ_FIRST(&client->offered_leases); + TAILQ_REMOVE(&client->offered_leases, lease, next); + make_decline(lease); + send_decline(); + free_client_lease(lease); + } if (!picked) { state_panic(); |