diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-12-27 20:56:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-12-27 20:56:34 +0000 |
| commit | 531e711a9d985e79e6954fb8dcaa22fb2143c00c (patch) | |
| tree | c315fae5f04d51a159aa37e86a5119f5df585ffd /sbin/dhclient/dhcpd.h | |
| parent | 2a24cb03404d426b69fa9c14c86af40a490fd8d7 (diff) | |
Since we only have the single global struct interface_info, we
obviously have single global struct client_state and struct
client_config nested inside interface_info and client_state
respectively.
Pull them out to their own global variables and eliminate a bunch
(i.e. hundreds) of multi-level dereferences. Make it much nicer to
read.
No functional change.
"makes sense" henning@
Testing stevesk@, ok stevesk@
Diffstat (limited to 'sbin/dhclient/dhcpd.h')
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 0c5ba10cc66..9cd0612f0e6 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.56 2006/12/26 21:19:52 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.57 2006/12/27 20:56:33 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -182,7 +182,6 @@ struct client_state { struct dhcp_packet packet; int packet_length; struct iaddr requested_address; - struct client_config *config; char **scriptEnv; int scriptEnvsize; }; @@ -199,7 +198,6 @@ struct interface_info { size_t rbuf_offset; size_t rbuf_len; struct ifreq *ifp; - struct client_state *client; int noifmedia; int errors; int dead; @@ -226,6 +224,8 @@ struct protocol { /* External definitions... */ extern struct interface_info *ifi; +extern struct client_state *client; +extern struct client_config *config; /* options.c */ int cons_options(unsigned char *, const int, struct option_data *); |