experimental P2P-NAT-T for IKEv2 merged back from branch

src/charon/daemon.h

@@ -6,7 +6,8 @@
  */
 
 /*
- * Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
+ * Copyright (C) 2006-2007 Tobias Brunner
+ * Copyright (C) 2006 Daniel Roethlisberger
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
@@ -42,6 +43,11 @@ typedef struct daemon_t daemon_t;
 #include <sa/ike_sa_manager.h>
 #include <config/backend_manager.h>
 
+#ifdef P2P
+#include <sa/connect_manager.h>
+#include <sa/mediation_manager.h>
+#endif /* P2P */
+
 /**
  * @defgroup charon charon
  *
@@ -427,6 +433,18 @@ struct daemon_t {
 	 */
 	interface_manager_t *interfaces;
 	
+#ifdef P2P
+	/**
+	 * Connect manager
+	 */
+	connect_manager_t *connect_manager;
+	
+	/**
+	 * Mediation manager
+	 */
+	mediation_manager_t *mediation_manager;
+#endif /* P2P */
+	
 	/**
 	 * @brief Shut down the daemon.
 	 *