* removed 'ifdef USE_POOL' macros, since it is always ON

* rename some pool-related variables to prepare for the support of prefix-pool

1 files changed, 1 insertions, 12 deletions

diff --git a/config.h b/config.h
index e3c237b..fe56b3b 100644
--- a/config.h
+++ b/config.h
@@ -33,9 +33,6 @@
 TAILQ_HEAD(ia_conflist, ia_conf);
 TAILQ_HEAD(pifc_list, prefix_ifconf);
 
-#define USE_POOL
-
-#ifdef USE_POOL
 struct dhcp6_poolspec {
 	char* name;
 	u_int32_t pltime;
@@ -56,7 +53,6 @@ struct pool_conf {
 	struct in6_addr max;
 	struct in6_addr cur;
 };
-#endif /* USE_POOL */
 
 /* per-interface information */
 struct dhcp6_if {
@@ -80,9 +76,7 @@ struct dhcp6_if {
 #define DHCIFF_RAPID_COMMIT 0x2
 
 	int server_pref;	/* server preference (server only) */
-#ifdef USE_POOL
 	struct dhcp6_poolspec pool;	/* address pool (server only) */
-#endif
 	char *scriptpath;	/* path to config script (client only) */
 
 	struct dhcp6_list reqopt_list;
@@ -224,10 +218,8 @@ struct host_conf {
 	struct dhcp6_list prefix_list;
 	/* address to be assigned for the host */
 	struct dhcp6_list addr_list;
-#ifdef USE_POOL
 	/* address pool from which addresses are assigned for the host */
 	struct dhcp6_poolspec pool;
-#endif
 
 	/* secret key shared with the client for delayed authentication */
 	struct keyinfo *delayedkey;
@@ -272,7 +264,7 @@ struct cf_list {
 enum { DECL_SEND, DECL_ALLOW, DECL_INFO_ONLY, DECL_REQUEST, DECL_DUID,
        DECL_PREFIX, DECL_PREFERENCE, DECL_SCRIPT, DECL_DELAYEDKEY,
        DECL_ADDRESS,
-       DECL_RANGE, DECL_ADDRESSPOOL,	/* USE_POOL */
+       DECL_RANGE, DECL_ADDRESSPOOL,
        IFPARAM_SLA_ID, IFPARAM_SLA_LEN,
        DHCPOPT_RAPID_COMMIT, DHCPOPT_AUTHINFO,
        DHCPOPT_DNS, DHCPOPT_DNSNAME,
@@ -319,7 +311,6 @@ extern struct dhcp6_prefix *find_prefix6 __P((struct dhcp6_list *,
 					      struct dhcp6_prefix *));
 extern struct ia_conf *find_iaconf __P((struct ia_conflist *, int, u_int32_t));
 extern struct keyinfo *find_key __P((char *, size_t, u_int32_t));
-#ifdef USE_POOL
 extern int configure_pool __P((struct cf_namelist *));
 extern struct pool_conf *find_pool __P((const char *));
 extern int is_available_in_pool __P((struct pool_conf *, struct in6_addr *));
@@ -327,5 +318,3 @@ extern int get_free_address_from_pool __P((struct pool_conf *,
 	struct in6_addr *));
 struct host_conf *create_dynamic_hostconf __P((struct duid *,
 	struct dhcp6_poolspec *));
-#endif /* USE_POOL */
-