diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-05-28 15:23:47 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-05-28 15:23:47 +0000 |
| commit | 159aa0ac81a0386257ef3ad55c8b2be1d5b21a95 (patch) | |
| tree | 98e08710213ee916d8602b10d94b689944b789d9 /sbin/dhclient/dhclient.c | |
| parent | b798a658bbaa5333eb51ae6475bcc120e80c2dae (diff) | |
Reduce 'ifa' overloading by renaming proposal field from 'ifa' to
'address'.
Diffstat (limited to 'sbin/dhclient/dhclient.c')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 095fb399bda..f5789b10893 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.675 2020/05/26 23:42:11 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.676 2020/05/28 15:23:46 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1571,7 +1571,7 @@ send_release(struct interface_info *ifi) { ssize_t rslt; - rslt = send_packet(ifi, ifi->configured->ifa, ifi->destination, + rslt = send_packet(ifi, ifi->configured->address, ifi->destination, "DHCPRELEASE"); if (rslt != -1) log_debug("%s: DHCPRELEASE", log_procname); @@ -2028,7 +2028,7 @@ lease_as_proposal(struct client_lease *lease) fatal("proposal"); /* Fill in proposal. */ - proposal->ifa = lease->address; + proposal->address = lease->address; opt = &lease->options[DHO_INTERFACE_MTU]; if (opt->len == sizeof(mtu)) { @@ -2768,7 +2768,7 @@ release_lease(struct interface_info *ifi) if (ifi->configured == NULL || ifi->active == NULL) return; /* Nothing to release. */ - strlcpy(ifabuf, inet_ntoa(ifi->configured->ifa), sizeof(ifabuf)); + strlcpy(ifabuf, inet_ntoa(ifi->configured->address), sizeof(ifabuf)); opt = &ifi->active->options[DHO_DHCP_SERVER_IDENTIFIER]; if (opt->len == sizeof(in_addr_t)) |