denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed all usages of lib->attributes to hydra->attributes.

Browse Source
This commit is contained in:
Tobias Brunner
2010-03-24 18:54:26 +01:00
parent 567d3f1463
commit 58f86d0f0f
46 changed files with 95 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/Makefile.am
+9 -3
View 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/sets/cert_cache.c credentials/sets/cert_cache.h \
credentials/credential_set.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 = \ AM_CFLAGS = \
-DIPSEC_DIR=\"${ipsecdir}\" \ -DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_PIDDIR=\"${piddir}\"
libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
EXTRA_DIST = Android.mk EXTRA_DIST = Android.mk
src/libcharon/plugins/android/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/android/android_plugin.c
+3 -3
View File
@@ -16,7 +16,7 @@
#include "android_plugin.h" #include "android_plugin.h"
#include "android_handler.h" #include "android_handler.h"
#include <library.h> #include <hydra.h>
#include <daemon.h> #include <daemon.h>
typedef struct private_android_plugin_t private_android_plugin_t; typedef struct private_android_plugin_t private_android_plugin_t;
@@ -40,7 +40,7 @@ struct private_android_plugin_t {
METHOD(plugin_t, destroy, void, METHOD(plugin_t, destroy, void,
private_android_plugin_t *this) 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); this->handler->destroy(this->handler);
free(this); free(this);
} }
@@ -59,7 +59,7 @@ plugin_t *android_plugin_create()
.handler = android_handler_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; return &this->public.plugin;
} }
src/libcharon/plugins/attr/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/attr/attr_plugin.c
+3 -3
View File
@@ -16,7 +16,7 @@
#include "attr_plugin.h" #include "attr_plugin.h"
#include "attr_provider.h" #include "attr_provider.h"
#include <daemon.h> #include <hydra.h>
typedef struct private_attr_plugin_t private_attr_plugin_t; 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) 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); this->provider->destroy(this->provider);
free(this); free(this);
} }
@@ -56,7 +56,7 @@ plugin_t *attr_plugin_create()
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
this->provider = attr_provider_create(); 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; return &this->public.plugin;
} }
src/libcharon/plugins/eap_aka/Makefile.am
+1 -1
View 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 -I$(top_srcdir)/src/libsimaka
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_aka_3gpp2/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_gtc/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_identity/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_md5/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_mschapv2/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_radius/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_sim/Makefile.am
+1 -1
View 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 -I$(top_srcdir)/src/libsimaka
AM_CFLAGS = -rdynamic AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_sim_file/Makefile.am
+1 -1
View 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}\" AM_CFLAGS = -rdynamic -DIPSEC_CONFDIR=\"${sysconfdir}\"
src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/eap_simaka_reauth/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/kernel_klips/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/kernel_netlink/Makefile.am
+1 -1
View 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 \ AM_CFLAGS = -rdynamic \
-DROUTING_TABLE=${routing_table} \ -DROUTING_TABLE=${routing_table} \
src/libcharon/plugins/kernel_pfkey/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/kernel_pfroute/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/load_tester/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/medcli/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/medsrv/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/nm/Makefile.am
+1 -1
View 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 \ AM_CFLAGS = -rdynamic \
-DNM_CA_DIR=\"${nm_ca_dir}\" -DNM_CA_DIR=\"${nm_ca_dir}\"
src/libcharon/plugins/nm/nm_plugin.c
+3 -2
View File
@@ -18,6 +18,7 @@
#include "nm_creds.h" #include "nm_creds.h"
#include "nm_handler.h" #include "nm_handler.h"
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <processing/jobs/callback_job.h> #include <processing/jobs/callback_job.h>
@@ -84,7 +85,7 @@ static void destroy(private_nm_plugin_t *this)
g_object_unref(this->plugin); g_object_unref(this->plugin);
} }
charon->credentials->remove_set(charon->credentials, &this->creds->set); 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->creds->destroy(this->creds);
this->handler->destroy(this->handler); this->handler->destroy(this->handler);
free(this); free(this);
@@ -108,7 +109,7 @@ plugin_t *nm_plugin_create()
this->creds = nm_creds_create(); this->creds = nm_creds_create();
this->handler = nm_handler_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); charon->credentials->add_set(charon->credentials, &this->creds->set);
this->plugin = nm_strongswan_plugin_new(this->creds, this->handler); this->plugin = nm_strongswan_plugin_new(this->creds, this->handler);
if (!this->plugin) if (!this->plugin)
src/libcharon/plugins/resolve/Makefile.am
+1 -1
View 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 \ AM_CFLAGS = -rdynamic \
-DRESOLV_CONF=\"${resolv_conf}\" -DRESOLV_CONF=\"${resolv_conf}\"
src/libcharon/plugins/resolve/resolve_plugin.c
+3 -3
View File
@@ -16,7 +16,7 @@
#include "resolve_plugin.h" #include "resolve_plugin.h"
#include "resolve_handler.h" #include "resolve_handler.h"
#include <daemon.h> #include <hydra.h>
typedef struct private_resolve_plugin_t private_resolve_plugin_t; 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) 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); this->handler->destroy(this->handler);
free(this); free(this);
} }
@@ -55,7 +55,7 @@ plugin_t *resolve_plugin_create()
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
this->handler = resolve_handler_create(); 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; return &this->public.plugin;
} }
src/libcharon/plugins/smp/Makefile.am
+1 -1
View 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}\" AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
src/libcharon/plugins/socket_default/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/socket_dynamic/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/socket_raw/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/sql/Makefile.am
+1 -1
View 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 \ AM_CFLAGS = -rdynamic \
-DPLUGINS=\""${libstrongswan_plugins}\"" -DPLUGINS=\""${libstrongswan_plugins}\""
src/libcharon/plugins/stroke/Makefile.am
+1 -1
View 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 = \ AM_CFLAGS = \
-rdynamic \ -rdynamic \
src/libcharon/plugins/stroke/stroke_socket.c
+3 -2
View File
@@ -25,6 +25,7 @@
#include <errno.h> #include <errno.h>
#include <processing/jobs/callback_job.h> #include <processing/jobs/callback_job.h>
#include <hydra.h>
#include <daemon.h> #include <daemon.h>
#include <threading/thread.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->ca->set);
charon->credentials->remove_set(charon->credentials, &this->cred->set); charon->credentials->remove_set(charon->credentials, &this->cred->set);
charon->backends->remove_backend(charon->backends, &this->config->backend); 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->cred->destroy(this->cred);
this->ca->destroy(this->ca); this->ca->destroy(this->ca);
this->config->destroy(this->config); 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->ca->set);
charon->credentials->add_set(charon->credentials, &this->cred->set); charon->credentials->add_set(charon->credentials, &this->cred->set);
charon->backends->add_backend(charon->backends, &this->config->backend); 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->job = callback_job_create((callback_job_cb_t)receive,
this, NULL, NULL); this, NULL, NULL);
src/libcharon/plugins/uci/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/unit_tester/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/plugins/unit_tester/tests/test_pool.c
+5 -4
View File
@@ -17,6 +17,7 @@
#include <library.h> #include <library.h>
#include <threading/thread.h> #include <threading/thread.h>
#include <hydra.h>
#define ALLOCS 1000 #define ALLOCS 1000
#define THREADS 20 #define THREADS 20
@@ -39,8 +40,8 @@ static void* testing(void *thread)
/* allocate addresses */ /* allocate addresses */
for (i = 0; i < ALLOCS; i++) for (i = 0; i < ALLOCS; i++)
{ {
addr[i] = lib->attributes->acquire_address(lib->attributes, addr[i] = hydra->attributes->acquire_address(hydra->attributes,
"test", id[i], NULL); "test", id[i], NULL);
if (!addr[i]) if (!addr[i])
{ {
return (void*)FALSE; return (void*)FALSE;
@@ -50,8 +51,8 @@ static void* testing(void *thread)
/* release addresses */ /* release addresses */
for (i = 0; i < ALLOCS; i++) for (i = 0; i < ALLOCS; i++)
{ {
lib->attributes->release_address(lib->attributes, hydra->attributes->release_address(hydra->attributes,
"test", addr[i], id[i]); "test", addr[i], id[i]);
} }
/* cleanup */ /* cleanup */
src/libcharon/plugins/updown/Makefile.am
+1 -1
View 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 AM_CFLAGS = -rdynamic
src/libcharon/sa/ike_sa.c
+4 -3
View File
@@ -25,6 +25,7 @@
#include <library.h> #include <library.h>
#include <daemon.h> #include <daemon.h>
#include <hydra.h>
#include <utils/linked_list.h> #include <utils/linked_list.h>
#include <utils/lexparser.h> #include <utils/lexparser.h>
#include <sa/task_manager.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, while (this->attributes->remove_last(this->attributes,
(void**)&entry) == SUCCESS) (void**)&entry) == SUCCESS)
{ {
lib->attributes->release(lib->attributes, entry->handler, hydra->attributes->release(hydra->attributes, entry->handler,
this->other_id, entry->type, entry->data); this->other_id, entry->type, entry->data);
free(entry->data.ptr); free(entry->data.ptr);
free(entry); 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)) 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->peer_cfg->get_pool(this->peer_cfg),
this->other_virtual_ip, this->other_id); this->other_virtual_ip, this->other_id);
} }
src/libcharon/sa/ike_sa.h
+1
View File
@@ -31,6 +31,7 @@ typedef enum statistic_t statistic_t;
typedef struct ike_sa_t ike_sa_t; typedef struct ike_sa_t ike_sa_t;
#include <library.h> #include <library.h>
#include <attributes/attribute_handler.h>
#include <encoding/message.h> #include <encoding/message.h>
#include <encoding/payloads/proposal_substructure.h> #include <encoding/payloads/proposal_substructure.h>
#include <encoding/payloads/configuration_attribute.h> #include <encoding/payloads/configuration_attribute.h>
src/libcharon/sa/tasks/ike_config.c
+6 -5
View File
@@ -17,6 +17,7 @@
#include "ike_config.h" #include "ike_config.h"
#include <daemon.h> #include <daemon.h>
#include <hydra.h>
#include <encoding/payloads/cp_payload.h> #include <encoding/payloads/cp_payload.h>
typedef struct private_ike_config_t private_ike_config_t; 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); enumerator->destroy(enumerator);
/* and pass it to the handle function */ /* 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, this->ike_sa->get_other_id(this->ike_sa), handler,
ca->get_type(ca), ca->get_value(ca)); ca->get_type(ca), ca->get_value(ca));
if (handler) 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)); 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); this->ike_sa->get_other_id(this->ike_sa), vip);
while (enumerator->enumerate(enumerator, &handler, &type, &data)) 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); DBG1(DBG_IKE, "peer requested virtual IP %H", this->virtual_ip);
if (config->get_pool(config)) 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); config->get_pool(config), id, this->virtual_ip);
} }
if (vip == NULL) 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 */ /* query registered providers for additional attributes to include */
enumerator = lib->attributes->create_responder_enumerator( enumerator = hydra->attributes->create_responder_enumerator(
lib->attributes, id, vip); hydra->attributes, id, vip);
while (enumerator->enumerate(enumerator, &type, &value)) while (enumerator->enumerate(enumerator, &type, &value))
{ {
if (!cp) if (!cp)
src/libhydra/plugins/attr_sql/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra
AM_CFLAGS = \ AM_CFLAGS = \
-rdynamic \ -rdynamic \
src/libhydra/plugins/attr_sql/attr_sql_plugin.c
+3 -3
View File
@@ -13,7 +13,7 @@
* for more details. * for more details.
*/ */
#include <library.h> #include <hydra.h>
#include <debug.h> #include <debug.h>
#include "attr_sql_plugin.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) 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->attribute->destroy(this->attribute);
this->db->destroy(this->db); this->db->destroy(this->db);
free(this); free(this);
@@ -81,7 +81,7 @@ plugin_t *attr_sql_plugin_create()
return NULL; return NULL;
} }
this->attribute = sql_attribute_create(this->db); 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; return &this->public.plugin;
} }
src/libsimaka/Makefile.am
+1 -1
View 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 noinst_LTLIBRARIES = libsimaka.la
libsimaka_la_SOURCES = simaka_message.h simaka_message.c \ libsimaka_la_SOURCES = simaka_message.h simaka_message.c \
src/pluto/connections.c
+4 -3
View File
@@ -30,6 +30,7 @@
#include <freeswan.h> #include <freeswan.h>
#include "kameipsec.h" #include "kameipsec.h"
#include <hydra.h>
#include <credentials/certificates/ac.h> #include <credentials/certificates/ac.h>
#include <credentials/keys/private_key.h> #include <credentials/keys/private_key.h>
@@ -369,8 +370,8 @@ void delete_connection(connection_t *c, bool relations)
host_t *vip; host_t *vip;
vip = host_create_from_sockaddr((sockaddr_t*)&c->spd.that.host_srcip); vip = host_create_from_sockaddr((sockaddr_t*)&c->spd.that.host_srcip);
lib->attributes->release_address(lib->attributes, c->spd.that.pool, hydra->attributes->release_address(hydra->attributes, c->spd.that.pool,
vip, c->spd.that.id); vip, c->spd.that.id);
vip->destroy(vip); vip->destroy(vip);
} }
@@ -2758,7 +2759,7 @@ static void initiate_opportunistic_body(struct find_oppo_bundle *b,
addrtot(&b->peer_client, 0, pcb, sizeof(pcb)); addrtot(&b->peer_client, 0, pcb, sizeof(pcb));
loglog(RC_OPPOFAILURE, loglog(RC_OPPOFAILURE,
"no suitable connection for opportunism " "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); ocb, pcb, ac->gateways_from_dns->gw_id);
#ifdef KLIPS #ifdef KLIPS
src/pluto/modecfg.c
+4 -3
View File
@@ -26,6 +26,7 @@
#include <freeswan.h> #include <freeswan.h>
#include <library.h> #include <library.h>
#include <hydra.h>
#include <attributes/attributes.h> #include <attributes/attributes.h>
#include <crypto/prfs/prf.h> #include <crypto/prfs/prf.h>
@@ -129,7 +130,7 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
{ {
if (c->spd.that.pool) 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, c->spd.that.pool, c->spd.that.id,
requested_vip); requested_vip);
if (vip) if (vip)
@@ -217,7 +218,7 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
} }
/* assign attributes from registered providers */ /* 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); c->spd.that.id, vip);
while (enumerator->enumerate(enumerator, &type, &value)) while (enumerator->enumerate(enumerator, &type, &value))
{ {
@@ -257,7 +258,7 @@ static void get_internal_addr(connection_t *c, host_t *requested_vip,
/* fallthrough */ /* fallthrough */
case INTERNAL_IP4_NBNS: case INTERNAL_IP4_NBNS:
if (nbns_idx >= NBNS_SERVER_MAX) if (nbns_idx >= NBNS_SERVER_MAX)
{ {
plog("exceeded the maximum number of %d NBNS servers", plog("exceeded the maximum number of %d NBNS servers",
NBNS_SERVER_MAX); NBNS_SERVER_MAX);
break; break;