Changed all usages of lib->attributes to hydra->attributes.
authorTobias Brunner <tobias@strongswan.org>
Wed, 24 Mar 2010 16:46:29 +0000 (17:46 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Mar 2010 17:54:26 +0000 (18:54 +0100)
46 files changed:
src/libcharon/Makefile.am
src/libcharon/plugins/android/Makefile.am
src/libcharon/plugins/android/android_plugin.c
src/libcharon/plugins/attr/Makefile.am
src/libcharon/plugins/attr/attr_plugin.c
src/libcharon/plugins/eap_aka/Makefile.am
src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
src/libcharon/plugins/eap_gtc/Makefile.am
src/libcharon/plugins/eap_identity/Makefile.am
src/libcharon/plugins/eap_md5/Makefile.am
src/libcharon/plugins/eap_mschapv2/Makefile.am
src/libcharon/plugins/eap_radius/Makefile.am
src/libcharon/plugins/eap_sim/Makefile.am
src/libcharon/plugins/eap_sim_file/Makefile.am
src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
src/libcharon/plugins/eap_simaka_reauth/Makefile.am
src/libcharon/plugins/kernel_klips/Makefile.am
src/libcharon/plugins/kernel_netlink/Makefile.am
src/libcharon/plugins/kernel_pfkey/Makefile.am
src/libcharon/plugins/kernel_pfroute/Makefile.am
src/libcharon/plugins/load_tester/Makefile.am
src/libcharon/plugins/medcli/Makefile.am
src/libcharon/plugins/medsrv/Makefile.am
src/libcharon/plugins/nm/Makefile.am
src/libcharon/plugins/nm/nm_plugin.c
src/libcharon/plugins/resolve/Makefile.am
src/libcharon/plugins/resolve/resolve_plugin.c
src/libcharon/plugins/smp/Makefile.am
src/libcharon/plugins/socket_default/Makefile.am
src/libcharon/plugins/socket_dynamic/Makefile.am
src/libcharon/plugins/socket_raw/Makefile.am
src/libcharon/plugins/sql/Makefile.am
src/libcharon/plugins/stroke/Makefile.am
src/libcharon/plugins/stroke/stroke_socket.c
src/libcharon/plugins/uci/Makefile.am
src/libcharon/plugins/unit_tester/Makefile.am
src/libcharon/plugins/unit_tester/tests/test_pool.c
src/libcharon/plugins/updown/Makefile.am
src/libcharon/sa/ike_sa.c
src/libcharon/sa/ike_sa.h
src/libcharon/sa/tasks/ike_config.c
src/libhydra/plugins/attr_sql/Makefile.am
src/libhydra/plugins/attr_sql/attr_sql_plugin.c
src/libsimaka/Makefile.am
src/pluto/connections.c
src/pluto/modecfg.c

index f8dd0e5..01a5df0 100644 (file)
@@ -100,10 +100,16 @@ credentials/sets/ocsp_response_wrapper.c credentials/sets/ocsp_response_wrapper.
 credentials/sets/cert_cache.c credentials/sets/cert_cache.h \
 credentials/credential_set.h
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = \
+       -I${linux_headers} \
+       -I$(top_srcdir)/src/libstrongswan \
+       -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon
+
 AM_CFLAGS = \
-  -DIPSEC_DIR=\"${ipsecdir}\" \
-  -DIPSEC_PIDDIR=\"${piddir}\"
+       -DIPSEC_DIR=\"${ipsecdir}\" \
+       -DIPSEC_PIDDIR=\"${piddir}\"
+
 libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
 
 EXTRA_DIST = Android.mk
index 5c6c3f7..df1c54d 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index f21066a..9a558f5 100644 (file)
@@ -16,7 +16,7 @@
 #include "android_plugin.h"
 #include "android_handler.h"
 
-#include <library.h>
+#include <hydra.h>
 #include <daemon.h>
 
 typedef struct private_android_plugin_t private_android_plugin_t;
@@ -40,7 +40,7 @@ struct private_android_plugin_t {
 METHOD(plugin_t, destroy, void,
        private_android_plugin_t *this)
 {
-       lib->attributes->remove_handler(lib->attributes, &this->handler->handler);
+       hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler);
        this->handler->destroy(this->handler);
        free(this);
 }
@@ -59,7 +59,7 @@ plugin_t *android_plugin_create()
                .handler = android_handler_create(),
        );
 
-       lib->attributes->add_handler(lib->attributes, &this->handler->handler);
+       hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
 
        return &this->public.plugin;
 }
index 917c126..2a1e9b5 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 9325fc1..24c00bb 100644 (file)
@@ -16,7 +16,7 @@
 #include "attr_plugin.h"
 #include "attr_provider.h"
 
-#include <daemon.h>
+#include <hydra.h>
 
 typedef struct private_attr_plugin_t private_attr_plugin_t;
 
@@ -41,7 +41,7 @@ struct private_attr_plugin_t {
  */
 static void destroy(private_attr_plugin_t *this)
 {
-       lib->attributes->remove_provider(lib->attributes, &this->provider->provider);
+       hydra->attributes->remove_provider(hydra->attributes, &this->provider->provider);
        this->provider->destroy(this->provider);
        free(this);
 }
@@ -56,7 +56,7 @@ plugin_t *attr_plugin_create()
        this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
 
        this->provider = attr_provider_create();
-       lib->attributes->add_provider(lib->attributes, &this->provider->provider);
+       hydra->attributes->add_provider(hydra->attributes, &this->provider->provider);
 
        return &this->public.plugin;
 }
index b57da4c..e7766e8 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon \
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon \
   -I$(top_srcdir)/src/libsimaka
 
 AM_CFLAGS = -rdynamic
index 606a52c..11fd816 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 2df288d..c67d45f 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 66efa7b..b399147 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 85769f0..c401743 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 018e713..c2e1c9d 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 1ea2c48..14a0c59 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 3186433..64fbb6d 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon \
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon \
   -I$(top_srcdir)/src/libsimaka
 
 AM_CFLAGS = -rdynamic
index 5c5699c..c3bb1ed 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
 
index f845f23..fc29f89 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 92d2df4..e1b0abc 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index b5fb6d4..0de2ac2 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 59a368a..8284cb7 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic \
 -DROUTING_TABLE=${routing_table} \
index 251f860..9996ab3 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 98d2a49..e4b4259 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 4bcaa36..fde89ae 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 513f0ec..e2510d8 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 8b65d2c..ab33048 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 5720171..ec5fac4 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon ${nm_CFLAGS}
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon ${nm_CFLAGS}
 
 AM_CFLAGS = -rdynamic \
   -DNM_CA_DIR=\"${nm_ca_dir}\"
index f2abcaf..6087f65 100644 (file)
@@ -18,6 +18,7 @@
 #include "nm_creds.h"
 #include "nm_handler.h"
 
+#include <hydra.h>
 #include <daemon.h>
 #include <processing/jobs/callback_job.h>
 
@@ -84,7 +85,7 @@ static void destroy(private_nm_plugin_t *this)
                g_object_unref(this->plugin);
        }
        charon->credentials->remove_set(charon->credentials, &this->creds->set);
-       lib->attributes->remove_handler(lib->attributes, &this->handler->handler);
+       hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler);
        this->creds->destroy(this->creds);
        this->handler->destroy(this->handler);
        free(this);
@@ -108,7 +109,7 @@ plugin_t *nm_plugin_create()
 
        this->creds = nm_creds_create();
        this->handler = nm_handler_create();
-       lib->attributes->add_handler(lib->attributes, &this->handler->handler);
+       hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
        charon->credentials->add_set(charon->credentials, &this->creds->set);
        this->plugin = nm_strongswan_plugin_new(this->creds, this->handler);
        if (!this->plugin)
index 8793708..68bc953 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic \
   -DRESOLV_CONF=\"${resolv_conf}\"
index 4bc9a2b..5021295 100644 (file)
@@ -16,7 +16,7 @@
 #include "resolve_plugin.h"
 #include "resolve_handler.h"
 
-#include <daemon.h>
+#include <hydra.h>
 
 typedef struct private_resolve_plugin_t private_resolve_plugin_t;
 
@@ -41,7 +41,7 @@ struct private_resolve_plugin_t {
  */
 static void destroy(private_resolve_plugin_t *this)
 {
-       lib->attributes->remove_handler(lib->attributes, &this->handler->handler);
+       hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler);
        this->handler->destroy(this->handler);
        free(this);
 }
@@ -55,7 +55,7 @@ plugin_t *resolve_plugin_create()
 
        this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
        this->handler = resolve_handler_create();
-       lib->attributes->add_handler(lib->attributes, &this->handler->handler);
+       hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
 
        return &this->public.plugin;
 }
index 392d496..4a3f26a 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon ${xml_CFLAGS}
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon ${xml_CFLAGS}
 
 AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
 
index 02f9289..d559122 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index c898cee..1755870 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 0d621c0..f4dae9f 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 940235e..1b0807e 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic \
   -DPLUGINS=\""${libstrongswan_plugins}\""
index 004ca1b..4982a19 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/stroke
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/stroke
 
 AM_CFLAGS = \
 -rdynamic \
index 820e097..56c18da 100644 (file)
@@ -25,6 +25,7 @@
 #include <errno.h>
 
 #include <processing/jobs/callback_job.h>
+#include <hydra.h>
 #include <daemon.h>
 #include <threading/thread.h>
 
@@ -624,7 +625,7 @@ static void destroy(private_stroke_socket_t *this)
        charon->credentials->remove_set(charon->credentials, &this->ca->set);
        charon->credentials->remove_set(charon->credentials, &this->cred->set);
        charon->backends->remove_backend(charon->backends, &this->config->backend);
-       lib->attributes->remove_provider(lib->attributes, &this->attribute->provider);
+       hydra->attributes->remove_provider(hydra->attributes, &this->attribute->provider);
        this->cred->destroy(this->cred);
        this->ca->destroy(this->ca);
        this->config->destroy(this->config);
@@ -659,7 +660,7 @@ stroke_socket_t *stroke_socket_create()
        charon->credentials->add_set(charon->credentials, &this->ca->set);
        charon->credentials->add_set(charon->credentials, &this->cred->set);
        charon->backends->add_backend(charon->backends, &this->config->backend);
-       lib->attributes->add_provider(lib->attributes, &this->attribute->provider);
+       hydra->attributes->add_provider(hydra->attributes, &this->attribute->provider);
 
        this->job = callback_job_create((callback_job_cb_t)receive,
                                                                        this, NULL, NULL);
index d6899f7..86b435c 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 5bf97ca..7a06d5e 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index 69a9e53..a68246f 100644 (file)
@@ -17,6 +17,7 @@
 
 #include <library.h>
 #include <threading/thread.h>
+#include <hydra.h>
 
 #define ALLOCS 1000
 #define THREADS 20
@@ -39,8 +40,8 @@ static void* testing(void *thread)
        /* allocate addresses */
        for (i = 0; i < ALLOCS; i++)
        {
-               addr[i] = lib->attributes->acquire_address(lib->attributes,
-                                                                                                  "test", id[i], NULL);
+               addr[i] = hydra->attributes->acquire_address(hydra->attributes,
+                                                                                                        "test", id[i], NULL);
                if (!addr[i])
                {
                        return (void*)FALSE;
@@ -50,8 +51,8 @@ static void* testing(void *thread)
        /* release addresses */
        for (i = 0; i < ALLOCS; i++)
        {
-               lib->attributes->release_address(lib->attributes,
-                                                                                "test", addr[i], id[i]);
+               hydra->attributes->release_address(hydra->attributes,
+                                                                                  "test", addr[i], id[i]);
        }
 
        /* cleanup */
index e525569..3c621fe 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 
index c3a1b94..cc2b95d 100644 (file)
@@ -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);
                }
index 4dce193..59a5a2c 100644 (file)
@@ -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>
index f010439..c252bd9 100644 (file)
@@ -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)
index 9d73f2e..dbfedd1 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra
 
 AM_CFLAGS = \
        -rdynamic \
index 981af98..632bd35 100644 (file)
@@ -13,7 +13,7 @@
  * for more details.
  */
 
-#include <library.h>
+#include <hydra.h>
 #include <debug.h>
 
 #include "attr_sql_plugin.h"
@@ -48,7 +48,7 @@ struct private_attr_sql_plugin_t {
  */
 static void destroy(private_attr_sql_plugin_t *this)
 {
-       lib->attributes->remove_provider(lib->attributes, &this->attribute->provider);
+       hydra->attributes->remove_provider(hydra->attributes, &this->attribute->provider);
        this->attribute->destroy(this->attribute);
        this->db->destroy(this->db);
        free(this);
@@ -81,7 +81,7 @@ plugin_t *attr_sql_plugin_create()
                return NULL;
        }
        this->attribute = sql_attribute_create(this->db);
-       lib->attributes->add_provider(lib->attributes, &this->attribute->provider);
+       hydra->attributes->add_provider(hydra->attributes, &this->attribute->provider);
 
        return &this->public.plugin;
 }
index 6e632c0..8e7a1f0 100644 (file)
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
 
 noinst_LTLIBRARIES = libsimaka.la
 libsimaka_la_SOURCES = simaka_message.h simaka_message.c \
index fece34e..cd76370 100644 (file)
@@ -30,6 +30,7 @@
 #include <freeswan.h>
 #include "kameipsec.h"
 
+#include <hydra.h>
 #include <credentials/certificates/ac.h>
 #include <credentials/keys/private_key.h>
 
@@ -104,7 +105,7 @@ bool his_id_was_instantiated(const connection_t *c)
        {
                identification_t *host;
                bool equal;
-       
+
                host = identification_create_from_sockaddr((sockaddr_t*)&c->spd.that.host_addr);
                equal = host->equals(host, c->spd.that.id);
                host->destroy(host);
@@ -113,7 +114,7 @@ bool his_id_was_instantiated(const connection_t *c)
        else
        {
                return TRUE;
-       } 
+       }
 }
 
 /**
@@ -369,8 +370,8 @@ void delete_connection(connection_t *c, bool relations)
                host_t *vip;
 
                vip = host_create_from_sockaddr((sockaddr_t*)&c->spd.that.host_srcip);
-               lib->attributes->release_address(lib->attributes, c->spd.that.pool,
-                                                                                vip, c->spd.that.id);
+               hydra->attributes->release_address(hydra->attributes, c->spd.that.pool,
+                                                                                  vip, c->spd.that.id);
                vip->destroy(vip);
        }
 
@@ -683,7 +684,7 @@ size_t format_end(char *buf, size_t buf_len, const struct end *this,
        }
 
        /* id */
-       snprintf(host_id, sizeof(host_id), "[%Y]", this->id); 
+       snprintf(host_id, sizeof(host_id), "[%Y]", this->id);
 
        /* [---hop] */
        hop[0] = '\0';
@@ -769,7 +770,7 @@ static void load_end_certificate(char *filename, struct end *dst)
        cert_t *cert = NULL;
        certificate_t *certificate;
        bool cached_cert = FALSE;
-       
+
        /* initialize end certificate */
        dst->cert = NULL;
 
@@ -1794,7 +1795,7 @@ connection_t *build_outgoing_opportunistic_connection(struct gw_info *gw,
        else
        {
                chunk_t encoding = gw->gw_id->get_encoding(gw->gw_id);
-               id_type_t type   = gw->gw_id->get_type(gw->gw_id); 
+               id_type_t type   = gw->gw_id->get_type(gw->gw_id);
                ip_address ip_addr;
 
                initaddr(encoding.ptr, encoding.len,
@@ -2758,7 +2759,7 @@ static void initiate_opportunistic_body(struct find_oppo_bundle *b,
                                        addrtot(&b->peer_client, 0, pcb, sizeof(pcb));
                                        loglog(RC_OPPOFAILURE,
                                                        "no suitable connection for opportunism "
-                                                       "between %s and %s with %Y as peer",
+                                                       "between %s and %s with %Y as peer",
                                                         ocb, pcb, ac->gateways_from_dns->gw_id);
 
 #ifdef KLIPS
@@ -3379,7 +3380,7 @@ connection_t *refine_host_connection(const struct state *st,
                        id_match_t match_level = peer_id->matches(peer_id, d->spd.that.id);
 
                        bool matching_id = match_level > ID_MATCH_NONE;
-                               
+
                        bool matching_auth = (d->policy & auth_policy) != LEMPTY;
 
                        bool matching_trust = trusted_ca(peer_ca
@@ -3580,7 +3581,7 @@ static connection_t *fc_try(const connection_t *c, struct host_pair *hp,
        policy_prio_t best_prio = BOTTOM_PRIO;
        id_match_t match_level;
        int pathlen;
-       
+
 
        const bool peer_net_is_host = subnetisaddr(peer_net, &c->spd.that.host_addr);
 
@@ -3843,7 +3844,7 @@ void get_peer_ca_and_groups(connection_t *c,
                if (cert && ac_verify_cert(cert, strict_crl_policy))
                {
                        ac_t *ac = (ac_t*)cert;
-               
+
                        *peer_attributes = ac->get_groups(ac);
                }
                else
index 03ec7f4..5622dc9 100644 (file)
@@ -26,6 +26,7 @@
 #include <freeswan.h>
 
 #include <library.h>
+#include <hydra.h>
 #include <attributes/attributes.h>
 #include <crypto/prfs/prf.h>
 
@@ -129,13 +130,13 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
        {
                if (c->spd.that.pool)
                {
-                       vip = lib->attributes->acquire_address(lib->attributes,
+                       vip = hydra->attributes->acquire_address(hydra->attributes,
                                                                                c->spd.that.pool, c->spd.that.id,
                                                                                requested_vip);
                        if (vip)
                        {
                                chunk_t addr = vip->get_address(vip);
-               
+
                                plog("assigning virtual IP %H to peer", vip);
                                initaddr(addr.ptr, addr.len, vip->get_family(vip), &ia->ipaddr);
 
@@ -217,14 +218,14 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
        }
 
        /* assign attributes from registered providers */
-       enumerator = lib->attributes->create_responder_enumerator(lib->attributes,
+       enumerator = hydra->attributes->create_responder_enumerator(hydra->attributes,
                                                                                        c->spd.that.id, vip);
        while (enumerator->enumerate(enumerator, &type, &value))
        {
                err_t ugh;
                host_t *server;
                sa_family_t family = AF_INET;
-               
+
                switch (type)
                {
                        case INTERNAL_IP6_DNS:
@@ -257,7 +258,7 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
                                /* fallthrough */
                        case INTERNAL_IP4_NBNS:
                                if (nbns_idx >= NBNS_SERVER_MAX)
-                               {
+                               {
                                        plog("exceeded the maximum number of %d NBNS servers",
                                                 NBNS_SERVER_MAX);
                                        break;
@@ -279,7 +280,7 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
 
                        default:
                                break;
-               }                       
+               }
        }
        enumerator->destroy(enumerator);
        DESTROY_IF(vip);