Moved ha plugin to libcharon

22 files changed, 15 insertions, 2 deletions

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 14d3c39bb..df056ad9f 100644
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -388,6 +388,14 @@ if MONOLITHIC
 endif
 endif
 
+if USE_HA
+  SUBDIRS += plugins/ha
+  PLUGINS += ha
+if MONOLITHIC
+  libcharon_la_LIBADD += plugins/ha/libstrongswan-ha.la
+endif
+endif
+
 if USE_UCI
   SUBDIRS += plugins/uci
   PLUGINS += uci
diff --git a/src/charon/plugins/ha/Makefile.am b/src/libcharon/plugins/ha/Makefile.am
index 52dc95de0..9d321dc8f 100644
--- a/src/charon/plugins/ha/Makefile.am
+++ b/src/libcharon/plugins/ha/Makefile.am
@@ -1,9 +1,14 @@
 
-INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
 
 AM_CFLAGS = -rdynamic -DIPSEC_PIDDIR=\"${piddir}\"
 
+if MONOLITHIC
+noinst_LTLIBRARIES = libstrongswan-ha.la
+else
 plugin_LTLIBRARIES = libstrongswan-ha.la
+endif
+
 libstrongswan_ha_la_SOURCES = \
   ha_plugin.h ha_plugin.c \
   ha_message.h ha_message.c \
@@ -15,5 +20,5 @@ libstrongswan_ha_la_SOURCES = \
   ha_ctl.h ha_ctl.c \
   ha_ike.h ha_ike.c \
   ha_child.h ha_child.c
-libstrongswan_ha_la_LDFLAGS = -module
+libstrongswan_ha_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/charon/plugins/ha/ha_child.c b/src/libcharon/plugins/ha/ha_child.c
index 2eb8e27f6..2eb8e27f6 100644
--- a/src/charon/plugins/ha/ha_child.c
+++ b/src/libcharon/plugins/ha/ha_child.c
diff --git a/src/charon/plugins/ha/ha_child.h b/src/libcharon/plugins/ha/ha_child.h
index ea83495f7..ea83495f7 100644
--- a/src/charon/plugins/ha/ha_child.h
+++ b/src/libcharon/plugins/ha/ha_child.h
diff --git a/src/charon/plugins/ha/ha_ctl.c b/src/libcharon/plugins/ha/ha_ctl.c
index 441d26d9e..441d26d9e 100644
--- a/src/charon/plugins/ha/ha_ctl.c
+++ b/src/libcharon/plugins/ha/ha_ctl.c
diff --git a/src/charon/plugins/ha/ha_ctl.h b/src/libcharon/plugins/ha/ha_ctl.h
index f33a809be..f33a809be 100644
--- a/src/charon/plugins/ha/ha_ctl.h
+++ b/src/libcharon/plugins/ha/ha_ctl.h
diff --git a/src/charon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 4acf7477a..4acf7477a 100644
--- a/src/charon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
diff --git a/src/charon/plugins/ha/ha_dispatcher.h b/src/libcharon/plugins/ha/ha_dispatcher.h
index d2baace3f..d2baace3f 100644
--- a/src/charon/plugins/ha/ha_dispatcher.h
+++ b/src/libcharon/plugins/ha/ha_dispatcher.h
diff --git a/src/charon/plugins/ha/ha_ike.c b/src/libcharon/plugins/ha/ha_ike.c
index 501c79b43..501c79b43 100644
--- a/src/charon/plugins/ha/ha_ike.c
+++ b/src/libcharon/plugins/ha/ha_ike.c
diff --git a/src/charon/plugins/ha/ha_ike.h b/src/libcharon/plugins/ha/ha_ike.h
index 9de210e67..9de210e67 100644
--- a/src/charon/plugins/ha/ha_ike.h
+++ b/src/libcharon/plugins/ha/ha_ike.h
diff --git a/src/charon/plugins/ha/ha_kernel.c b/src/libcharon/plugins/ha/ha_kernel.c
index 0ad9c22c3..0ad9c22c3 100644
--- a/src/charon/plugins/ha/ha_kernel.c
+++ b/src/libcharon/plugins/ha/ha_kernel.c
diff --git a/src/charon/plugins/ha/ha_kernel.h b/src/libcharon/plugins/ha/ha_kernel.h
index b37cc7667..b37cc7667 100644
--- a/src/charon/plugins/ha/ha_kernel.h
+++ b/src/libcharon/plugins/ha/ha_kernel.h
diff --git a/src/charon/plugins/ha/ha_message.c b/src/libcharon/plugins/ha/ha_message.c
index cd6c90af3..cd6c90af3 100644
--- a/src/charon/plugins/ha/ha_message.c
+++ b/src/libcharon/plugins/ha/ha_message.c
diff --git a/src/charon/plugins/ha/ha_message.h b/src/libcharon/plugins/ha/ha_message.h
index 620413288..620413288 100644
--- a/src/charon/plugins/ha/ha_message.h
+++ b/src/libcharon/plugins/ha/ha_message.h
diff --git a/src/charon/plugins/ha/ha_plugin.c b/src/libcharon/plugins/ha/ha_plugin.c
index 661db8af8..661db8af8 100644
--- a/src/charon/plugins/ha/ha_plugin.c
+++ b/src/libcharon/plugins/ha/ha_plugin.c
diff --git a/src/charon/plugins/ha/ha_plugin.h b/src/libcharon/plugins/ha/ha_plugin.h
index e83712fa6..e83712fa6 100644
--- a/src/charon/plugins/ha/ha_plugin.h
+++ b/src/libcharon/plugins/ha/ha_plugin.h
diff --git a/src/charon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c
index 3575d05b8..3575d05b8 100644
--- a/src/charon/plugins/ha/ha_segments.c
+++ b/src/libcharon/plugins/ha/ha_segments.c
diff --git a/src/charon/plugins/ha/ha_segments.h b/src/libcharon/plugins/ha/ha_segments.h
index 6d1cd5441..6d1cd5441 100644
--- a/src/charon/plugins/ha/ha_segments.h
+++ b/src/libcharon/plugins/ha/ha_segments.h
diff --git a/src/charon/plugins/ha/ha_socket.c b/src/libcharon/plugins/ha/ha_socket.c
index b84b02868..b84b02868 100644
--- a/src/charon/plugins/ha/ha_socket.c
+++ b/src/libcharon/plugins/ha/ha_socket.c
diff --git a/src/charon/plugins/ha/ha_socket.h b/src/libcharon/plugins/ha/ha_socket.h
index 8d398e22b..8d398e22b 100644
--- a/src/charon/plugins/ha/ha_socket.h
+++ b/src/libcharon/plugins/ha/ha_socket.h
diff --git a/src/charon/plugins/ha/ha_tunnel.c b/src/libcharon/plugins/ha/ha_tunnel.c
index 97a252dae..97a252dae 100644
--- a/src/charon/plugins/ha/ha_tunnel.c
+++ b/src/libcharon/plugins/ha/ha_tunnel.c
diff --git a/src/charon/plugins/ha/ha_tunnel.h b/src/libcharon/plugins/ha/ha_tunnel.h
index 085fb6122..085fb6122 100644
--- a/src/charon/plugins/ha/ha_tunnel.h
+++ b/src/libcharon/plugins/ha/ha_tunnel.h