diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2018-02-06 21:09:11 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2018-02-06 21:09:11 +0000 |
| commit | 58b0140b741d2292dca6be5d47a1070e6e384f8f (patch) | |
| tree | 0796b15ed97a18cf852d19cc35a13bb2eed92c1d /sbin/dhclient | |
| parent | b07ee77fe9a39a9d6d29ba651496304aa39ac185 (diff) | |
Nuke unused state S_REBINDING. We just use the time
to decide between unicast and broadcast for REQUEST.
Diffstat (limited to 'sbin/dhclient')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 11 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 9f54fa1e086..82221d6e318 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.557 2018/02/06 21:01:27 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.558 2018/02/06 21:09:10 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -896,8 +896,7 @@ dhcpack(struct interface_info *ifi, struct option_data *options, if (ifi->state != S_REBOOTING && ifi->state != S_REQUESTING && - ifi->state != S_RENEWING && - ifi->state != S_REBINDING) { + ifi->state != S_RENEWING) { DPRINTF("%s: unexpected DHCPACK from %s - state #%d", log_procname, src, ifi->state); return; @@ -928,8 +927,7 @@ dhcpnak(struct interface_info *ifi, const char *src) { if (ifi->state != S_REBOOTING && ifi->state != S_REQUESTING && - ifi->state != S_RENEWING && - ifi->state != S_REBINDING) { + ifi->state != S_RENEWING) { DPRINTF("%s: unexpected DHCPNAK from %s - state #%d", log_procname, src, ifi->state); return; @@ -1660,8 +1658,7 @@ make_request(struct interface_info *ifi, struct client_lease * lease) * set ciaddr to zero. */ if (ifi->state == S_BOUND || - ifi->state == S_RENEWING || - ifi->state == S_REBINDING) + ifi->state == S_RENEWING) packet->ciaddr.s_addr = lease->address.s_addr; else packet->ciaddr.s_addr = INADDR_ANY; diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index b78727e5543..22de7fee676 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.250 2018/02/06 00:25:09 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.251 2018/02/06 21:09:10 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -75,8 +75,7 @@ enum dhcp_state { S_SELECTING, S_REQUESTING, S_BOUND, - S_RENEWING, - S_REBINDING + S_RENEWING }; TAILQ_HEAD(client_lease_tq, client_lease); |