summaryrefslogtreecommitdiff
path: root/sbin/dhclient/dhcpd.h
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2014-12-10 02:34:04 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2014-12-10 02:34:04 +0000
commit6c884b1aea9f49bb410c6f668305ba22d26d27de (patch)
tree4357fc9abd444aa7b82eb3a0229ca04c83d03b1c /sbin/dhclient/dhcpd.h
parent598757624e1af81825ada1401cc3df0d5bb1a43f (diff)
Reusing the same field for different things in different contexts may
be clever, but it is definitely confusing. Use a flag IFI_VALID_LLADDR to indicate that the ifi->hw_address field is valid, rather than assuming ifi->linkstat does that. Add startup_time to record client startup rather than using first_sending and hoping nobody else needs it until link is complete.
Diffstat (limited to 'sbin/dhclient/dhcpd.h')
-rw-r--r--sbin/dhclient/dhcpd.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 50eb887592e..200ad224f24 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcpd.h,v 1.145 2014/12/05 15:47:05 krw Exp $ */
+/* $OpenBSD: dhcpd.h,v 1.146 2014/12/10 02:34:03 krw Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -163,6 +163,7 @@ struct client_state {
u_int32_t xid;
u_int16_t secs;
time_t first_sending;
+ time_t startup_time;
time_t interval;
struct dhcp_packet packet;
struct dhcp_packet bootrequest_packet;
@@ -184,9 +185,10 @@ struct interface_info {
int linkstat;
int rdomain;
int flags;
-#define IFI_NEW_LLADDR 0x00000001
-#define IFI_HUP 0x00000002
-#define IFI_NOMEDIA 0x00000004
+#define IFI_VALID_LLADDR 0x00000001
+#define IFI_NEW_LLADDR 0x00000002
+#define IFI_NOMEDIA 0x00000004
+#define IFI_HUP 0x00000008
};
struct dhcp_timeout {