Moved settings_t to utils folder

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index f024f2cfbb1f731c168114aeb805fb25b49c5e5d..47470c35773801fd59ebe1fbf1889ca2c259e0aa 100644 (file)
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 # copy-n-paste from Makefile.am
 LOCAL_SRC_FILES := \
-library.c settings.c \
+library.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
 collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
 collections/linked_list.c \
@@ -32,7 +32,7 @@ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
 utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
 utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
-utils/printf_hook.c
+utils/printf_hook.c utils/settings.c
 
 # adding the plugin source files
 

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 205cb6467e6a54c1c27517e63a84e0c547f83c88..2aed071eb1070c76b436769d253148bf10996ba0 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -1,7 +1,7 @@
 ipseclib_LTLIBRARIES = libstrongswan.la
 
 libstrongswan_la_SOURCES = \
-library.c settings.c \
+library.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
 collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
 collections/linked_list.c \
@@ -30,12 +30,12 @@ selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
 utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \
 utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \
-utils/printf_hook.c
+utils/printf_hook.c utils/settings.c
 
 if USE_DEV_HEADERS
 strongswan_includedir = ${dev_headers}
 nobase_strongswan_include_HEADERS = \
-library.h settings.h \
+library.h \
 asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \
 collections/blocking_queue.h collections/enumerator.h collections/hashtable.h \
 collections/linked_list.h \
@@ -71,7 +71,7 @@ threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h
 threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \
 utils.h utils/chunk.h utils/debug.h utils/enum.h utils/identification.h \
 utils/lexparser.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
-utils/leak_detective.h utils/printf_hook.h utils/integrity_checker.h
+utils/leak_detective.h utils/printf_hook.h utils/settings.h utils/integrity_checker.h
 endif
 
 library.lo :   $(top_builddir)/config.status

diff --git a/src/libstrongswan/crypto/crypto_factory.h b/src/libstrongswan/crypto/crypto_factory.h
index 611ca0bbbf98913ba9f18990d6487e08835cbf17..5d23c897769a5fac0d2c3c43c998d4a7c21c2e94 100644 (file)
--- a/src/libstrongswan/crypto/crypto_factory.h
+++ b/src/libstrongswan/crypto/crypto_factory.h
@@ -24,6 +24,7 @@
 typedef struct crypto_factory_t crypto_factory_t;
 
 #include <library.h>
+#include <collections/enumerator.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/aead.h>
 #include <crypto/signers/signer.h>

diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 699d5cb2e596ee8aecc8f98d6719dc7000a438a8..e547c7eeca30138b39f4a0c4e07a7e851cb2bc7f 100644 (file)
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -83,7 +83,6 @@
 /* make sure we include printf_hook.h first */
 #include "utils/printf_hook.h"
 #include "utils.h"
-#include "settings.h"
 #include "networking/host_resolver.h"
 #include "processing/processor.h"
 #include "processing/scheduler.h"
@@ -97,6 +96,7 @@
 #include "utils/chunk.h"
 #include "utils/integrity_checker.h"
 #include "utils/leak_detective.h"
+#include "utils/settings.h"
 #include "plugins/plugin_loader.h"
 
 typedef struct library_t library_t;

diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/utils/settings.c
similarity index 100%
rename from src/libstrongswan/settings.c
rename to src/libstrongswan/utils/settings.c

diff --git a/src/libstrongswan/settings.h b/src/libstrongswan/utils/settings.h
similarity index 99%
rename from src/libstrongswan/settings.h
rename to src/libstrongswan/utils/settings.h
index 4246b3118d9d5dfe6df2aace2e44b49f1a94128e..ae4e719e861aebcfdf12e7776538a8aad4bb1d53 100644 (file)
--- a/src/libstrongswan/settings.h
+++ b/src/libstrongswan/utils/settings.h
@@ -16,7 +16,7 @@
 
 /**
  * @defgroup settings settings
- * @{ @ingroup libstrongswan
+ * @{ @ingroup utils
  */
 
 #ifndef SETTINGS_H_
@@ -24,7 +24,7 @@
 
 typedef struct settings_t settings_t;
 
-#include "utils.h"
+#include "../utils.h"
 #include "collections/enumerator.h"
 
 /**