Imported Upstream version 4.6.4

3 files changed, 79 insertions, 104 deletions

diff --git a/src/libhydra/attributes/attribute_manager.c b/src/libhydra/attributes/attribute_manager.c
index 0d4cbda82..95520531e 100644
--- a/src/libhydra/attributes/attribute_manager.c
+++ b/src/libhydra/attributes/attribute_manager.c
@@ -59,12 +59,9 @@ typedef struct {
 	host_t *vip;
 } enum_data_t;
 
-/**
- * Implementation of attribute_manager_t.acquire_address.
- */
-static host_t* acquire_address(private_attribute_manager_t *this,
-							   char *pool, identification_t *id,
-							   host_t *requested)
+METHOD(attribute_manager_t, acquire_address, host_t*,
+	private_attribute_manager_t *this, char *pool, identification_t *id,
+	host_t *requested)
 {
 	enumerator_t *enumerator;
 	attribute_provider_t *current;
@@ -90,11 +87,9 @@ static host_t* acquire_address(private_attribute_manager_t *this,
 	return host;
 }
 
-/**
- * Implementation of attribute_manager_t.release_address.
- */
-static void release_address(private_attribute_manager_t *this,
-							char *pool, host_t *address, identification_t *id)
+METHOD(attribute_manager_t, release_address, void,
+	private_attribute_manager_t *this, char *pool, host_t *address,
+	identification_t *id)
 {
 	enumerator_t *enumerator;
 	attribute_provider_t *current;
@@ -129,12 +124,9 @@ static enumerator_t *responder_enum_create(attribute_provider_t *provider,
 												 data->id, data->vip);
 }
 
-/**
- * Implementation of attribute_manager_t.create_responder_enumerator
- */
-static enumerator_t* create_responder_enumerator(
-								private_attribute_manager_t *this, char *pool,
-								identification_t *id, host_t *vip)
+METHOD(attribute_manager_t, create_responder_enumerator, enumerator_t*,
+	private_attribute_manager_t *this, char *pool, identification_t *id,
+	host_t *vip)
 {
 	enum_data_t *data = malloc_thing(enum_data_t);
 
@@ -149,34 +141,26 @@ static enumerator_t* create_responder_enumerator(
 				(void*)this->lock->unlock, this->lock);
 }
 
-/**
- * Implementation of attribute_manager_t.add_provider.
- */
-static void add_provider(private_attribute_manager_t *this,
-						 attribute_provider_t *provider)
+METHOD(attribute_manager_t, add_provider, void,
+	private_attribute_manager_t *this, attribute_provider_t *provider)
 {
 	this->lock->write_lock(this->lock);
 	this->providers->insert_last(this->providers, provider);
 	this->lock->unlock(this->lock);
 }
 
-/**
- * Implementation of attribute_manager_t.remove_provider.
- */
-static void remove_provider(private_attribute_manager_t *this,
-							attribute_provider_t *provider)
+METHOD(attribute_manager_t, remove_provider, void,
+	private_attribute_manager_t *this, attribute_provider_t *provider)
 {
 	this->lock->write_lock(this->lock);
 	this->providers->remove(this->providers, provider, NULL);
 	this->lock->unlock(this->lock);
 }
 
-/**
- * Implementation of attribute_manager_t.handle
- */
-static attribute_handler_t* handle(private_attribute_manager_t *this,
-						identification_t *server, attribute_handler_t *handler,
-						configuration_attribute_type_t type, chunk_t data)
+METHOD(attribute_manager_t, handle, attribute_handler_t*,
+	private_attribute_manager_t *this, identification_t *server,
+	attribute_handler_t *handler, configuration_attribute_type_t type,
+	chunk_t data)
 {
 	enumerator_t *enumerator;
 	attribute_handler_t *current, *handled = NULL;
@@ -217,13 +201,9 @@ static attribute_handler_t* handle(private_attribute_manager_t *this,
 	return handled;
 }
 
-/**
- * Implementation of attribute_manager_t.release
- */
-static void release(private_attribute_manager_t *this,
-					attribute_handler_t *handler,
-					identification_t *server,
-					configuration_attribute_type_t type, chunk_t data)
+METHOD(attribute_manager_t, release, void,
+	private_attribute_manager_t *this, attribute_handler_t *handler,
+	identification_t *server, configuration_attribute_type_t type, chunk_t data)
 {
 	enumerator_t *enumerator;
 	attribute_handler_t *current;
@@ -297,11 +277,8 @@ static void initiator_destroy(initiator_enumerator_t *this)
 	free(this);
 }
 
-/**
- * Implementation of attribute_manager_t.create_initiator_enumerator
- */
-static enumerator_t* create_initiator_enumerator(
-		private_attribute_manager_t *this, identification_t *id, host_t *vip)
+METHOD(attribute_manager_t, create_initiator_enumerator, enumerator_t*,
+	private_attribute_manager_t *this, identification_t *id, host_t *vip)
 {
 	initiator_enumerator_t *enumerator = malloc_thing(initiator_enumerator_t);
 
@@ -318,32 +295,24 @@ static enumerator_t* create_initiator_enumerator(
 	return &enumerator->public;
 }
 
-/**
- * Implementation of attribute_manager_t.add_handler
- */
-static void add_handler(private_attribute_manager_t *this,
-						attribute_handler_t *handler)
+METHOD(attribute_manager_t, add_handler, void,
+	private_attribute_manager_t *this, attribute_handler_t *handler)
 {
 	this->lock->write_lock(this->lock);
 	this->handlers->insert_last(this->handlers, handler);
 	this->lock->unlock(this->lock);
 }
 
-/**
- * Implementation of attribute_manager_t.remove_handler
- */
-static void remove_handler(private_attribute_manager_t *this,
-						attribute_handler_t *handler)
+METHOD(attribute_manager_t, remove_handler, void,
+	private_attribute_manager_t *this, attribute_handler_t *handler)
 {
 	this->lock->write_lock(this->lock);
 	this->handlers->remove(this->handlers, handler, NULL);
 	this->lock->unlock(this->lock);
 }
 
-/**
- * Implementation of attribute_manager_t.destroy
- */
-static void destroy(private_attribute_manager_t *this)
+METHOD(attribute_manager_t, destroy, void,
+	private_attribute_manager_t *this)
 {
 	this->providers->destroy(this->providers);
 	this->handlers->destroy(this->handlers);
@@ -356,23 +325,26 @@ static void destroy(private_attribute_manager_t *this)
  */
 attribute_manager_t *attribute_manager_create()
 {
-	private_attribute_manager_t *this = malloc_thing(private_attribute_manager_t);
-
-	this->public.acquire_address = (host_t*(*)(attribute_manager_t*, char*, identification_t*,host_t*))acquire_address;
-	this->public.release_address = (void(*)(attribute_manager_t*, char *, host_t*, identification_t*))release_address;
-	this->public.create_responder_enumerator = (enumerator_t*(*)(attribute_manager_t*, char *name, identification_t*, host_t*))create_responder_enumerator;
-	this->public.add_provider = (void(*)(attribute_manager_t*, attribute_provider_t *provider))add_provider;
-	this->public.remove_provider = (void(*)(attribute_manager_t*, attribute_provider_t *provider))remove_provider;
-	this->public.handle = (attribute_handler_t*(*)(attribute_manager_t*,identification_t*, attribute_handler_t*, configuration_attribute_type_t, chunk_t))handle;
-	this->public.release = (void(*)(attribute_manager_t*, attribute_handler_t*, identification_t*, configuration_attribute_type_t, chunk_t))release;
-	this->public.create_initiator_enumerator = (enumerator_t*(*)(attribute_manager_t*, identification_t*, host_t*))create_initiator_enumerator;
-	this->public.add_handler = (void(*)(attribute_manager_t*, attribute_handler_t*))add_handler;
-	this->public.remove_handler = (void(*)(attribute_manager_t*, attribute_handler_t*))remove_handler;
-	this->public.destroy = (void(*)(attribute_manager_t*))destroy;
-
-	this->providers = linked_list_create();
-	this->handlers = linked_list_create();
-	this->lock = rwlock_create(RWLOCK_TYPE_DEFAULT);
+	private_attribute_manager_t *this;
+
+	INIT(this,
+		.public = {
+			.acquire_address = _acquire_address,
+			.release_address = _release_address,
+			.create_responder_enumerator = _create_responder_enumerator,
+			.add_provider = _add_provider,
+			.remove_provider = _remove_provider,
+			.handle = _handle,
+			.release = _release,
+			.create_initiator_enumerator = _create_initiator_enumerator,
+			.add_handler = _add_handler,
+			.remove_handler = _remove_handler,
+			.destroy = _destroy,
+		},
+		.providers = linked_list_create(),
+		.handlers = linked_list_create(),
+		.lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
+	);
 
 	return &this->public;
 }
diff --git a/src/libhydra/attributes/attributes.c b/src/libhydra/attributes/attributes.c
index ea87109e2..d8490b7f5 100644
--- a/src/libhydra/attributes/attributes.c
+++ b/src/libhydra/attributes/attributes.c
@@ -17,7 +17,7 @@
 
 #include "attributes.h"
 
-ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, INTERNAL_IP6_PREFIX,
+ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, HOME_AGENT_ADDRESS,
 	"INTERNAL_IP4_ADDRESS",
 	"INTERNAL_IP4_NETMASK",
 	"INTERNAL_IP4_DNS",
@@ -35,8 +35,9 @@ ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, INTERNAL_IP
 	"INTERNAL_IP6_SUBNET",
 	"MIP6_HOME_PREFIX",
 	"INTERNAL_IP6_LINK",
-	"INTERNAL_IP6_PREFIX");
-ENUM_NEXT(configuration_attribute_type_names, XAUTH_TYPE, XAUTH_ANSWER, INTERNAL_IP6_PREFIX,
+	"INTERNAL_IP6_PREFIX",
+	"HOME_AGENT_ADDRESS");
+ENUM_NEXT(configuration_attribute_type_names, XAUTH_TYPE, XAUTH_ANSWER, HOME_AGENT_ADDRESS,
 	"XAUTH_TYPE",
 	"XAUTH_USER_NAME",
 	"XAUTH_USER_PASSWORD",
@@ -64,7 +65,7 @@ ENUM_NEXT(configuration_attribute_type_names, UNITY_BANNER, UNITY_DDNS_HOSTNAME,
 	"UNITY_DDNS_HOSTNAME");
 ENUM_END(configuration_attribute_type_names, UNITY_DDNS_HOSTNAME);
 
-ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, INTERNAL_IP6_PREFIX,
+ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, HOME_AGENT_ADDRESS,
 	"ADDR",
 	"MASK",
 	"DNS",
@@ -78,35 +79,36 @@ ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, INTER
 	"NBNS6",
 	"DHCP6",
 	"SUBNET",
-	"SUPPORTED",
+	"SUP",
 	"SUBNET6",
 	"MIP6HPFX",
 	"LINK6",
-	"PFX6");
-ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, INTERNAL_IP6_PREFIX,
-	"XAUTH_TYPE",
-	"XAUTH_USER_NAME",
-	"XAUTH_USER_PASSWORD",
-	"XAUTH_PASSCODE",
-	"XAUTH_MESSAGE",
-	"XAUTH_CHALLENGE",
-	"XAUTH_DOMAIN",
-	"XAUTH_STATUS",
-	"XAUTH_NEXT_PIN",
-	"XAUTH_ANSWER");
+	"PFX6",
+	"HOA");
+ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, HOME_AGENT_ADDRESS,
+	"X_TYPE",
+	"X_USER_NAME",
+	"X_USER_PASSWORD",
+	"X_PASSCODE",
+	"X_MESSAGE",
+	"X_CHALLENGE",
+	"X_DOMAIN",
+	"X_STATUS",
+	"X_NEXT_PIN",
+	"X_ANSWER");
 ENUM_NEXT(configuration_attribute_type_short_names, INTERNAL_IP4_SERVER, INTERNAL_IP6_SERVER, XAUTH_ANSWER,
 	"SRV",
 	"SRV6");
 ENUM_NEXT(configuration_attribute_type_short_names, UNITY_BANNER, UNITY_DDNS_HOSTNAME, INTERNAL_IP6_SERVER,
-	"UNITY_BANNER",
-	"UNITY_SAVE_PASSWD",
-	"UNITY_DEF_DOMAIN",
-	"UNITY_SPLITDNS_NAME",
-	"UNITY_SPLIT_INCLUDE",
-	"UNITY_NATT_PORT",
-	"UNITY_LOCAL_LAN",
-	"UNITY_PFS",
-	"UNITY_FW_TYPE",
-	"UNITY_BACKUP_SERVERS",
-	"UNITY_DDNS_HOSTNAME");
+	"U_BANNER",
+	"U_SAVE_PASSWD",
+	"U_DEF_DOMAIN",
+	"U_SPLITDNS_NAME",
+	"U_SPLIT_INCLUDE",
+	"U_NATT_PORT",
+	"U_LOCAL_LAN",
+	"U_PFS",
+	"U_FW_TYPE",
+	"U_BACKUP_SERVERS",
+	"U_DDNS_HOSTNAME");
 ENUM_END(configuration_attribute_type_short_names, UNITY_DDNS_HOSTNAME);
diff --git a/src/libhydra/attributes/attributes.h b/src/libhydra/attributes/attributes.h
index 3a40ba367..8ff774b64 100644
--- a/src/libhydra/attributes/attributes.h
+++ b/src/libhydra/attributes/attributes.h
@@ -48,6 +48,7 @@ enum configuration_attribute_type_t {
 	MIP6_HOME_PREFIX        = 16,
 	INTERNAL_IP6_LINK       = 17,
 	INTERNAL_IP6_PREFIX     = 18,
+	HOME_AGENT_ADDRESS		= 19,
 	/* XAUTH attributes */
 	XAUTH_TYPE              = 16520,
 	XAUTH_USER_NAME         = 16521,