From 8404fb0212f9fb77bc53b23004b829b488430700 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Sat, 11 Apr 2015 22:03:59 +0200
Subject: Imported Upstream version 5.3.0

---
 src/libcharon/daemon.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/libcharon/daemon.h')

diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h
index 36242bb04..d16bf1ddb 100644
--- a/src/libcharon/daemon.h
+++ b/src/libcharon/daemon.h
@@ -19,6 +19,9 @@
 /**
  * @defgroup libcharon libcharon
  *
+ * @defgroup attributes attributes
+ * @ingroup libcharon
+ *
  * @defgroup bus bus
  * @ingroup libcharon
  *
@@ -152,12 +155,14 @@
 
 typedef struct daemon_t daemon_t;
 
+#include <attributes/attribute_manager.h>
 #include <network/sender.h>
 #include <network/receiver.h>
 #include <network/socket_manager.h>
 #include <control/controller.h>
 #include <bus/bus.h>
 #include <sa/ike_sa_manager.h>
+#include <sa/child_sa_manager.h>
 #include <sa/trap_manager.h>
 #include <sa/shunt_manager.h>
 #include <config/backend_manager.h>
@@ -214,6 +219,11 @@ struct daemon_t {
 	 */
 	ike_sa_manager_t *ike_sa_manager;
 
+	/**
+	 * A child_sa_manager_t instance.
+	 */
+	child_sa_manager_t *child_sa_manager;
+
 	/**
 	 * Manager for triggering policies, called traps
 	 */
@@ -239,6 +249,11 @@ struct daemon_t {
 	 */
 	receiver_t *receiver;
 
+	/**
+	 * Manager for IKE configuration attributes
+	 */
+	attribute_manager_t *attributes;
+
 	/**
 	 * The signaling bus.
 	 */
-- 
cgit v1.2.3