Moved addrblock plugin to libcharon

diff --git a/configure.in b/configure.in
index a7a3171cd0d57f932f5ee6a13e6b7c0700c3432d..db70906ef6328d04bcafb3212a2590a364fe1ecc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -763,9 +763,6 @@ fi
 if test x$agent = xtrue; then
        libstrongswan_plugins=${libstrongswan_plugins}" agent"
 fi
-if test x$addrblock = xtrue; then
-       libstrongswan_plugins=${libstrongswan_plugins}" addrblock"
-fi
 if test x$gmp = xtrue; then
        libstrongswan_plugins=${libstrongswan_plugins}" gmp"
        pluto_plugins=${pluto_plugins}" gmp"
@@ -821,7 +818,6 @@ AM_CONDITIONAL(USE_PADLOCK, test x$padlock = xtrue)
 AM_CONDITIONAL(USE_OPENSSL, test x$openssl = xtrue)
 AM_CONDITIONAL(USE_GCRYPT, test x$gcrypt = xtrue)
 AM_CONDITIONAL(USE_AGENT, test x$agent = xtrue)
-AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
 
 dnl charon plugins
 dnl ==============
@@ -858,6 +854,7 @@ AM_CONDITIONAL(USE_SOCKET_DEFAULT, test x$socket_default = xtrue)
 AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue)
 AM_CONDITIONAL(USE_SOCKET_DYNAMIC, test x$socket_dynamic = xtrue)
 AM_CONDITIONAL(USE_FARP, test x$farp = xtrue)
+AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
 
 dnl hydra plugins
 dnl =============
@@ -947,7 +944,6 @@ AC_OUTPUT(
        src/libstrongswan/plugins/openssl/Makefile
        src/libstrongswan/plugins/gcrypt/Makefile
        src/libstrongswan/plugins/agent/Makefile
-       src/libstrongswan/plugins/addrblock/Makefile
        src/libstrongswan/plugins/test_vectors/Makefile
        src/libhydra/Makefile
        src/libhydra/plugins/attr/Makefile
@@ -985,6 +981,7 @@ AC_OUTPUT(
        src/libcharon/plugins/medsrv/Makefile
        src/libcharon/plugins/medcli/Makefile
        src/libcharon/plugins/nm/Makefile
+       src/libcharon/plugins/addrblock/Makefile
        src/libcharon/plugins/uci/Makefile
        src/libcharon/plugins/ha/Makefile
        src/libcharon/plugins/android/Makefile

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index d9540e6560c919f6bb7553e03f92677d948461cd..44501c0d02a72b1668e2eea13e4c6ac6fa40e30a 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -400,6 +400,14 @@ if MONOLITHIC
 endif
 endif
 
+if USE_ADDRBLOCK
+  SUBDIRS += plugins/addrblock
+  PLUGINS += addrblock
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/uci/libstrongswan-addrblock.la
+endif
+endif
+
 if USE_UNIT_TESTS
   SUBDIRS += plugins/unit_tester
   PLUGINS += unit-tester

diff --git a/src/libstrongswan/plugins/addrblock/Makefile.am b/src/libcharon/plugins/addrblock/Makefile.am
similarity index 75%
rename from src/libstrongswan/plugins/addrblock/Makefile.am
rename to src/libcharon/plugins/addrblock/Makefile.am
index 159d2e7817f1dce2dc09cbeb6f3d8f132cec0255..d844674ffba09d6d41bb16e4c628c9364625f3bd 100644 (file)
--- a/src/libstrongswan/plugins/addrblock/Makefile.am
+++ b/src/libcharon/plugins/addrblock/Makefile.am
@@ -1,5 +1,6 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
+       -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic
 

diff --git a/src/libstrongswan/plugins/addrblock/addrblock_plugin.c b/src/libcharon/plugins/addrblock/addrblock_plugin.c
similarity index 100%
rename from src/libstrongswan/plugins/addrblock/addrblock_plugin.c
rename to src/libcharon/plugins/addrblock/addrblock_plugin.c

diff --git a/src/libstrongswan/plugins/addrblock/addrblock_plugin.h b/src/libcharon/plugins/addrblock/addrblock_plugin.h
similarity index 98%
rename from src/libstrongswan/plugins/addrblock/addrblock_plugin.h
rename to src/libcharon/plugins/addrblock/addrblock_plugin.h
index e7c3a728e2141fe372e9b20e18d96bcbe0903014..87bd516f99ce20abf7fcc217ed62f65b09e80690 100644 (file)
--- a/src/libstrongswan/plugins/addrblock/addrblock_plugin.h
+++ b/src/libcharon/plugins/addrblock/addrblock_plugin.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup addrblock addrblock
- * @ingroup plugins
+ * @ingroup cplugins
  *
  * @defgroup addrblock_plugin addrblock_plugin
  * @{ @ingroup addrblock

diff --git a/src/libstrongswan/plugins/addrblock/addrblock_validator.c b/src/libcharon/plugins/addrblock/addrblock_validator.c
similarity index 100%
rename from src/libstrongswan/plugins/addrblock/addrblock_validator.c
rename to src/libcharon/plugins/addrblock/addrblock_validator.c

diff --git a/src/libstrongswan/plugins/addrblock/addrblock_validator.h b/src/libcharon/plugins/addrblock/addrblock_validator.h
similarity index 100%
rename from src/libstrongswan/plugins/addrblock/addrblock_validator.h
rename to src/libcharon/plugins/addrblock/addrblock_validator.h

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 0ef26c831d371122b278b5f0aef406c8f473c6cb..eb0ceb5305549b75da0fdb0f088e9ab4b35ee493 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -314,13 +314,6 @@ if MONOLITHIC
 endif
 endif
 
-if USE_ADDRBLOCK
-  SUBDIRS += plugins/addrblock
-if MONOLITHIC
-  libstrongswan_la_LIBADD += plugins/addrblock/libstrongswan-addrblock.la
-endif
-endif
-
 if USE_TEST_VECTORS
   SUBDIRS += plugins/test_vectors
 if MONOLITHIC