From 58f86d0f0fea14383c1836aa37a21edd38ad2e47 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 24 Mar 2010 17:46:29 +0100
Subject: Changed all usages of lib->attributes to hydra->attributes.

---
 src/libcharon/sa/ike_sa.c           |  7 ++++---
 src/libcharon/sa/ike_sa.h           |  1 +
 src/libcharon/sa/tasks/ike_config.c | 11 ++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/libcharon/sa')

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index c3a1b9407..cc2b95d44 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -25,6 +25,7 @@
 
 #include <library.h>
 #include <daemon.h>
+#include <hydra.h>
 #include <utils/linked_list.h>
 #include <utils/lexparser.h>
 #include <sa/task_manager.h>
@@ -2002,8 +2003,8 @@ static void destroy(private_ike_sa_t *this)
 	while (this->attributes->remove_last(this->attributes,
 										 (void**)&entry) == SUCCESS)
 	{
-		lib->attributes->release(lib->attributes, entry->handler,
-								 this->other_id, entry->type, entry->data);
+		hydra->attributes->release(hydra->attributes, entry->handler,
+								   this->other_id, entry->type, entry->data);
 		free(entry->data.ptr);
 		free(entry);
 	}
@@ -2027,7 +2028,7 @@ static void destroy(private_ike_sa_t *this)
 	{
 		if (this->peer_cfg && this->peer_cfg->get_pool(this->peer_cfg))
 		{
-			lib->attributes->release_address(lib->attributes,
+			hydra->attributes->release_address(hydra->attributes,
 									this->peer_cfg->get_pool(this->peer_cfg),
 									this->other_virtual_ip, this->other_id);
 		}
diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index 4dce1937c..59a5a2c50 100644
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -31,6 +31,7 @@ typedef enum statistic_t statistic_t;
 typedef struct ike_sa_t ike_sa_t;
 
 #include <library.h>
+#include <attributes/attribute_handler.h>
 #include <encoding/message.h>
 #include <encoding/payloads/proposal_substructure.h>
 #include <encoding/payloads/configuration_attribute.h>
diff --git a/src/libcharon/sa/tasks/ike_config.c b/src/libcharon/sa/tasks/ike_config.c
index f010439fe..c252bd9c7 100644
--- a/src/libcharon/sa/tasks/ike_config.c
+++ b/src/libcharon/sa/tasks/ike_config.c
@@ -17,6 +17,7 @@
 #include "ike_config.h"
 
 #include <daemon.h>
+#include <hydra.h>
 #include <encoding/payloads/cp_payload.h>
 
 typedef struct private_ike_config_t private_ike_config_t;
@@ -125,7 +126,7 @@ static void handle_attribute(private_ike_config_t *this,
 	enumerator->destroy(enumerator);
 
 	/* and pass it to the handle function */
-	handler = lib->attributes->handle(lib->attributes,
+	handler = hydra->attributes->handle(hydra->attributes,
 							this->ike_sa->get_other_id(this->ike_sa), handler,
 							ca->get_type(ca), ca->get_value(ca));
 	if (handler)
@@ -252,7 +253,7 @@ static status_t build_i(private_ike_config_t *this, message_t *message)
 			cp->add_attribute(cp, build_vip(vip));
 		}
 
-		enumerator = lib->attributes->create_initiator_enumerator(lib->attributes,
+		enumerator = hydra->attributes->create_initiator_enumerator(hydra->attributes,
 								this->ike_sa->get_other_id(this->ike_sa), vip);
 		while (enumerator->enumerate(enumerator, &handler, &type, &data))
 		{
@@ -353,7 +354,7 @@ static status_t build_r(private_ike_config_t *this, message_t *message)
 			DBG1(DBG_IKE, "peer requested virtual IP %H", this->virtual_ip);
 			if (config->get_pool(config))
 			{
-				vip = lib->attributes->acquire_address(lib->attributes,
+				vip = hydra->attributes->acquire_address(hydra->attributes,
 							config->get_pool(config), id, this->virtual_ip);
 			}
 			if (vip == NULL)
@@ -372,8 +373,8 @@ static status_t build_r(private_ike_config_t *this, message_t *message)
 		}
 
 		/* query registered providers for additional attributes to include */
-		enumerator = lib->attributes->create_responder_enumerator(
-													lib->attributes, id, vip);
+		enumerator = hydra->attributes->create_responder_enumerator(
+													hydra->attributes, id, vip);
 		while (enumerator->enumerate(enumerator, &type, &value))
 		{
 			if (!cp)
-- 
cgit v1.2.3