diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
| commit | a61949401890cbb33a9d6c4571b51c53460ad438 (patch) | |
| tree | 64dedaddb89896d5b1670a421af123670ca2120b /networking/udhcp/dhcpd.h | |
| parent | 03a7b173605a890e1db5177ecd5b8dd591081c41 (diff) | |
| parent | bcb1fc3e6ca6fe902610f507eaf9b0b58a5c583a (diff) | |
| download | busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.gz busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.bz2 busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/udhcp/dhcpd.h')
| -rw-r--r-- | networking/udhcp/dhcpd.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h index b8f96b029..ba11d77e8 100644 --- a/networking/udhcp/dhcpd.h +++ b/networking/udhcp/dhcpd.h | |||
| @@ -15,11 +15,7 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |||
| 15 | #define DHCPD_CONF_FILE "/etc/udhcpd.conf" | 15 | #define DHCPD_CONF_FILE "/etc/udhcpd.conf" |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | struct static_lease { | 18 | struct static_lease; |
| 19 | struct static_lease *next; | ||
| 20 | uint32_t nip; | ||
| 21 | uint8_t mac[6]; | ||
| 22 | }; | ||
| 23 | 19 | ||
| 24 | struct server_config_t { | 20 | struct server_config_t { |
| 25 | char *interface; /* interface to use */ | 21 | char *interface; /* interface to use */ |
| @@ -58,7 +54,7 @@ struct server_config_t { | |||
| 58 | } FIX_ALIASING; | 54 | } FIX_ALIASING; |
| 59 | 55 | ||
| 60 | #define server_config (*(struct server_config_t*)bb_common_bufsiz1) | 56 | #define server_config (*(struct server_config_t*)bb_common_bufsiz1) |
| 61 | /* client_config sits in 2nd half of bb_common_bufsiz1 */ | 57 | /* client_data sits in 2nd half of bb_common_bufsiz1 */ |
| 62 | 58 | ||
| 63 | #if ENABLE_FEATURE_UDHCP_PORT | 59 | #if ENABLE_FEATURE_UDHCP_PORT |
| 64 | #define SERVER_PORT (server_config.port) | 60 | #define SERVER_PORT (server_config.port) |