diff options
| author |   krw <krw@openbsd.org> | 2013-11-11 17:16:11 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2013-11-11 17:16:11 +0000 |
| commit | 6407afb8fb6d43b440e8d5fb85e7886d09a2a4df (patch) | |
| tree | 970fb823aa22ed67477fc399273de59a493ccec2 | |
| parent | Revert bpf.c 1.84 / bpfdesc.h 1.19 for now, "panic: timeout_add: to_ticks (-1) (diff) | |
| download | wireguard-openbsd-6407afb8fb6d43b440e8d5fb85e7886d09a2a4df.tar.xz wireguard-openbsd-6407afb8fb6d43b440e8d5fb85e7886d09a2a4df.zip | |
Argh. Set 'to' address to INADDR_BROADCAST, not 'from' address,
when trying to send broadcast request to server.
| -rw-r--r-- | sbin/dhclient/dhclient.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 18d60c06f53..feb66ddfeab 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.264 2013/11/11 15:39:20 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.265 2013/11/11 17:16:11 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1345,13 +1345,15 @@ send_request(void) client->interval = client->active->expiry - cur_time + 1; /* - * If the lease rebind time has elapsed, or if we're not yet bound, - * broadcast the DHCPREQUEST rather than unicasting. + * If the reboot timeout has expired, or the lease rebind time has + * elapsed, or if we're not yet bound, broadcast the DHCPREQUEST rather + * than unicasting. */ memset(&destination, 0, sizeof(destination)); if (client->state == S_REQUESTING || client->state == S_REBOOTING || - cur_time > client->active->rebind) + cur_time > client->active->rebind || + interval > config->reboot_timeout) destination.sin_addr.s_addr = INADDR_BROADCAST; else destination.sin_addr.s_addr = client->destination.s_addr; @@ -1359,8 +1361,7 @@ send_request(void) destination.sin_family = AF_INET; destination.sin_len = sizeof(destination); - if ((client->state != S_REQUESTING) && - (interval <= config->reboot_timeout)) + if (client->state != S_REQUESTING) from.s_addr = client->active->address.s_addr; else from.s_addr = INADDR_ANY; |