From: Ted Lemon <source@isc.org>
Date: Thu, 6 Jul 2000 10:06:21 +0000 (+0000)
Subject: Declare lease states in dhcpd.h.
X-Git-Tag: V3-BETA-2-PATCH-1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ea8b2077726a0d19fb9d5af9e6df8aab818a254;p=thirdparty%2Fdhcp.git

Declare lease states in dhcpd.h.
---

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 449669917..0c715f8d2 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -234,6 +234,19 @@ struct hardware {
 	u_int8_t hbuf [17];
 };
 
+/* Lease states: */
+typedef enum {
+	FTS_FREE = 1,
+	FTS_ACTIVE = 2,
+	FTS_EXPIRED = 3,
+	FTS_RELEASED = 4,
+	FTS_ABANDONED = 5,
+	FTS_RESET = 6,
+	FTS_BACKUP = 7,
+	FTS_RESERVED = 8,
+	FTS_BOOTP = 9
+} binding_state_t;
+
 /* A dhcp lease declaration structure. */
 struct lease {
 	OMAPI_OBJECT_PREAMBLE;
@@ -502,10 +515,10 @@ struct pool {
 	struct lease *backup;
 	struct lease *abandoned;
 	TIME next_event_time;
-#if defined (FAILOVER_PROTOCOL)
 	int lease_count;
 	int free_leases;
 	int backup_leases;
+#if defined (FAILOVER_PROTOCOL)
 	dhcp_failover_state_t *failover_peer;
 #endif
 };
diff --git a/includes/failover.h b/includes/failover.h
index fef57f856..63f70b505 100644
--- a/includes/failover.h
+++ b/includes/failover.h
@@ -156,19 +156,6 @@ typedef struct {
 #define FTR_HBA_CONFLICT	19
 #define FTR_UNKNOWN		254
 
-/* Lease states: */
-typedef enum {
-	FTS_FREE = 1,
-	FTS_ACTIVE = 2,
-	FTS_EXPIRED = 3,
-	FTS_RELEASED = 4,
-	FTS_ABANDONED = 5,
-	FTS_RESET = 6,
-	FTS_BACKUP = 7,
-	FTS_RESERVED = 8,
-	FTS_BOOTP = 9
-} binding_state_t;
-
 #define DHCP_FAILOVER_MAX_MESSAGE_SIZE	2048
 
 typedef struct {