- added separate implementation for connection_store, credential_store, policy_store

- added folder structure to config
- credentials are fetched solely on IDs now

1 files changed, 24 insertions, 3 deletions

diff --git a/Source/charon/daemon.h b/Source/charon/daemon.h
index 57372cc51..037f40cc5 100644
--- a/Source/charon/daemon.h
+++ b/Source/charon/daemon.h
@@ -36,9 +36,9 @@
 #include <queues/event_queue.h>
 #include <utils/logger_manager.h>
 #include <config/configuration.h>
-#include <config/connection_store.h>
-#include <config/policy_store.h>
-#include <config/credential_store.h>
+#include <config/connections/connection_store.h>
+#include <config/policies/policy_store.h>
+#include <config/credentials/credential_store.h>
 
 /**
  * @defgroup charon charon
@@ -202,6 +202,27 @@
  */
 #define PID_FILE "/var/run/charon.pid"
 
+/**
+ * Directory of IPsec relevant files
+ * 
+ * @ingroup charon
+ */
+#define IPSEC_DIR "/etc/ipsec.d/"
+
+/**
+ * Directory for private keys
+ * 
+ * @ingroup charon
+ */
+#define PRIVATE_KEY_DIR IPSEC_DIR "private/"
+
+/**
+ * Directory for trusted certificates
+ * 
+ * @ingroup charon
+ */
+#define CERTIFICATE_DIR IPSEC_DIR "certs/"
+
 
 typedef struct daemon_t daemon_t;