aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/android/android_plugin.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-02-16 18:17:09 +0100
committerTobias Brunner <tobias@strongswan.org>2012-08-08 15:07:43 +0200
commit162621ed573b73daa63f77c30c283bd5dcac9b2f (patch)
tree961077442f97dad168dba451e193f05b5fb7b545 /src/libcharon/plugins/android/android_plugin.c
parent657a3ba60907bffa943320621ecff7b45c89c156 (diff)
downloadstrongswan-162621ed573b73daa63f77c30c283bd5dcac9b2f.tar.bz2
strongswan-162621ed573b73daa63f77c30c283bd5dcac9b2f.tar.xz
Moved Android specific logger to separate plugin.
This is mainly because the other parts of the existing android plugin can not be built in the NDK (access to keystore and system properties are not part of the stable NDK libraries).
Diffstat (limited to 'src/libcharon/plugins/android/android_plugin.c')
-rw-r--r--src/libcharon/plugins/android/android_plugin.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/libcharon/plugins/android/android_plugin.c b/src/libcharon/plugins/android/android_plugin.c
index bad8bc042..c0f58e9b4 100644
--- a/src/libcharon/plugins/android/android_plugin.c
+++ b/src/libcharon/plugins/android/android_plugin.c
@@ -15,7 +15,6 @@
*/
#include "android_plugin.h"
-#include "android_logger.h"
#include "android_handler.h"
#include "android_creds.h"
#include "android_service.h"
@@ -36,11 +35,6 @@ struct private_android_plugin_t {
android_plugin_t public;
/**
- * Android specific logger
- */
- android_logger_t *logger;
-
- /**
* Android specific DNS handler
*/
android_handler_t *handler;
@@ -68,10 +62,8 @@ METHOD(plugin_t, destroy, void,
hydra->attributes->remove_handler(hydra->attributes,
&this->handler->handler);
lib->credmgr->remove_set(lib->credmgr, &this->creds->set);
- charon->bus->remove_logger(charon->bus, &this->logger->logger);
this->creds->destroy(this->creds);
this->handler->destroy(this->handler);
- this->logger->destroy(this->logger);
DESTROY_IF(this->service);
free(this);
}
@@ -91,14 +83,12 @@ plugin_t *android_plugin_create()
.destroy = _destroy,
},
},
- .logger = android_logger_create(),
.creds = android_creds_create(),
);
this->service = android_service_create(this->creds);
this->handler = android_handler_create(this->service != NULL);
- charon->bus->add_logger(charon->bus, &this->logger->logger);
lib->credmgr->add_set(lib->credmgr, &this->creds->set);
hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);