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/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
src/libcharon/plugins/android/android_plugin.c
+3 -3
View 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;
}
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
src/libcharon/plugins/attr/attr_plugin.c
+3 -3
View 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;
}
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
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
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
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
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
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
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
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
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}\"
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
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
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
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 \
-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
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
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
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
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
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 \
-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_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)
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 \
-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_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;
}
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}\"
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
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
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
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 \
-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 = \
-rdynamic \
src/libcharon/plugins/stroke/stroke_socket.c
+3 -2
View 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);
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
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
src/libcharon/plugins/unit_tester/tests/test_pool.c
+5 -4
View 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 */
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