diff options
| author |   krw <krw@openbsd.org> | 2017-11-27 13:13:19 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2017-11-27 13:13:19 +0000 |
| commit | faab9f5952f8268401d4834169a65e92d07eb557 (patch) | |
| tree | a3dac00037ad40d1e10612c57e41457b01a9b167 | |
| parent | Fix pasto so lease_rebind() returns rebind value and not (diff) | |
| download | wireguard-openbsd-faab9f5952f8268401d4834169a65e92d07eb557.tar.xz wireguard-openbsd-faab9f5952f8268401d4834169a65e92d07eb557.zip | |
Simplify lease_as_string() logic to use a single time_t variable
and lease_[expiry|rebind|renewal]() functions.
| -rw-r--r-- | sbin/dhclient/dhclient.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index eb69e501a11..d6c62002861 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.529 2017/11/27 13:09:20 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.530 2017/11/27 13:13:19 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1909,7 +1909,7 @@ lease_as_string(char *ifname, char *type, struct client_lease *lease) char timebuf[27]; /* 6 2017/04/08 05:47:50 UTC; */ struct option_data *opt; char *buf, *name; - time_t renewal, rebind, expiry; + time_t t; size_t rslt; int i; @@ -1971,36 +1971,24 @@ lease_as_string(char *ifname, char *type, struct client_lease *lease) append_statement(string, sizeof(string), " epoch ", buf); free(buf); - /* - * Save lease times, generate new ones based on lease info - * rather than effective times, print out lease-based times, - * restore effective times. - */ - expiry = lease->expiry; - set_lease_times(lease); - - renewal = lease_renewal(lease); - rslt = strftime(timebuf, sizeof(timebuf), DB_TIMEFMT, - gmtime(&renewal)); + t = lease_renewal(lease); + rslt = strftime(timebuf, sizeof(timebuf), DB_TIMEFMT, gmtime(&t)); if (rslt == 0) return NULL; append_statement(string, sizeof(string), " renew ", timebuf); - rebind = lease_rebind(lease); - rslt = strftime(timebuf, sizeof(timebuf), DB_TIMEFMT, - gmtime(&rebind)); + t = lease_rebind(lease); + rslt = strftime(timebuf, sizeof(timebuf), DB_TIMEFMT, gmtime(&t)); if (rslt == 0) return NULL; append_statement(string, sizeof(string), " rebind ", timebuf); - rslt = strftime(timebuf, sizeof(timebuf), DB_TIMEFMT, - gmtime(&lease->expiry)); + t = lease_expiry(lease); + rslt = strftime(timebuf, sizeof(timebuf), DB_TIMEFMT, gmtime(&t)); if (rslt == 0) return NULL; append_statement(string, sizeof(string), " expire ", timebuf); - lease->expiry = expiry; - rslt = strlcat(string, "}\n", sizeof(string)); if (rslt >= sizeof(string)) return NULL; |