diff options
| author | Thomas Markwalder <tmark@isc.org> | 2017-12-07 06:46:13 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2017-12-07 06:46:13 -0500 |
| commit | b4e157d82c161a3697011d64e840d4d5aeb3183d (patch) | |
| tree | 9287c0462b346af2024ad6b58a0a38d00452e6f1 /includes | |
| parent | f0f3555e0fe66778bf8f8733e4cd8fd0905aefb9 (diff) | |
| parent | fe78015bae07a5e497f5e2ca1381f32e60fd9efd (diff) | |
| download | isc-dhcp-b4e157d82c161a3697011d64e840d4d5aeb3183d.tar.gz | |
[master] Replaced --enable-secs-btyeorder with run-time parameter
Merges in rt45364
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/config.h.in | 3 | ||||
| -rw-r--r-- | includes/dhcpd.h | 3 | ||||
| -rw-r--r-- | includes/failover.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/includes/config.h.in b/includes/config.h.in index 4a3330d8..28a4cfa9 100644 --- a/includes/config.h.in +++ b/includes/config.h.in @@ -157,9 +157,6 @@ /* Define to any value to include Ari's PARANOIA patch. */ #undef PARANOIA -/* Define to correct bad byteorders in secs field. */ -#undef SECS_BYTEORDER - /* The size of `struct iaddr *', as computed by sizeof. */ #undef SIZEOF_STRUCT_IADDR_P diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 48d71737..1a6e8ef3 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -802,6 +802,9 @@ struct lease_state { #ifdef EUI_64 #define SV_USE_EUI_64 90 #endif +#if defined (FAILOVER_PROTOCOL) +#define SV_CHECK_SECS_BYTE_ORDER 91 +#endif #if !defined (DEFAULT_PING_TIMEOUT) # define DEFAULT_PING_TIMEOUT 1 diff --git a/includes/failover.h b/includes/failover.h index f6655f46..135b969f 100644 --- a/includes/failover.h +++ b/includes/failover.h @@ -392,5 +392,7 @@ typedef struct _dhcp_failover_state { u_int32_t updxid; /* XID of UPDREQ* message in action. */ } dhcp_failover_state_t; +extern int check_secs_byte_order; /* check byte order of secs field when true */ + #define DHCP_FAILOVER_VERSION 1 #endif /* FAILOVER_PROTOCOL */ |