X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=src%2Fstarter%2Fconfread.h;h=970166c90215ad7ab483d9cc1d18c45858bc64f3;hp=9793a55a53086be62cb98e2c920329fa9fcad322;hb=e0e6137dd3ab3694a3bdd1c2845a9fe2efee5087;hpb=9820c0e208fa5c7467fb89b1bda86ced6962e02f

diff --git a/src/starter/confread.h b/src/starter/confread.h
index 9793a55..970166c 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -46,6 +46,12 @@ typedef enum {
 	KEY_EXCHANGE_IKEV2
 } keyexchange_t;
 
+typedef enum {
+	STRICT_NO,
+	STRICT_YES,
+	STRICT_IFURI
+} strict_t;
+
 typedef struct starter_end starter_end_t;
 
 struct starter_end {
@@ -55,25 +61,25 @@ struct starter_end {
 	char		*cert;
 	char		*ca;
 	char		*groups;
-	char            *iface;
+	char		*iface;
 	ip_address	addr;
 	ip_address	nexthop;
 	ip_address	srcip;
-	ip_subnet       subnet;
+	ip_subnet	subnet;
 	bool		has_client;
 	bool		has_client_wildcard;
-        bool		has_port_wildcard;
+	bool		has_port_wildcard;
 	bool		has_srcip;
+	bool		has_natip;
 	bool		modecfg;
 	certpolicy_t	sendcert;
 	bool		firewall;
 	bool		hostaccess;
+	bool		allow_any;
 	char 		*updown;
 	u_int16_t	port;
 	u_int8_t	protocol;
-#ifdef VIRTUAL_IP
 	char		*virt;
-#endif
 };
 
 typedef struct also also_t;
@@ -96,6 +102,7 @@ struct starter_conn {
 	starter_state_t	state;
 
 	keyexchange_t	keyexchange;
+	int			eap;
 	lset_t 		policy;
 	time_t 		sa_ike_life_seconds;
 	time_t		sa_ipsec_life_seconds;
@@ -138,6 +145,7 @@ struct starter_ca {
 	char		*crluri;
 	char		*crluri2;
 	char		*ocspuri;
+	char		*ocspuri2;
 
 	bool		strict;
 
@@ -151,23 +159,28 @@ struct starter_config {
 		lset_t	seen;
 		char	**interfaces;
 		char	*dumpdir;
-
-		/* pluto keywords */
-		char	**plutodebug;
-		char	*prepluto;
-		char	*postpluto;
-		bool	uniqueids;
-		u_int	overridemtu;
-		u_int	crlcheckinterval;
-		bool	cachecrls;
-		bool	strictcrlpolicy;
-		bool	nocrsend;
-		bool	nat_traversal;
-		u_int	keep_alive;
-		char	*virtual_private;
-		char	*pkcs11module;
-		bool	pkcs11keepstate;
-		bool	pkcs11proxy;
+		bool	charonstart;
+		bool	plutostart;
+
+		/* pluto/charon keywords */
+		char	 **plutodebug;
+		char	 *charondebug;
+		char	 *prepluto;
+		char	 *postpluto;
+		bool	 uniqueids;
+		u_int	 overridemtu;
+		u_int	 crlcheckinterval;
+		bool	 cachecrls;
+		strict_t strictcrlpolicy;
+		bool	 nocrsend;
+		bool	 nat_traversal;
+		u_int	 keep_alive;
+		char	 *virtual_private;
+		char	 *eapdir;
+		char	 *pkcs11module;
+		char	 *pkcs11initargs;
+		bool	 pkcs11keepstate;
+		bool	 pkcs11proxy;
 
 		/* KLIPS keywords */
 		char	**klipsdebug;
@@ -180,7 +193,8 @@ struct starter_config {
 	defaultroute_t defaultroute;
 
 	/* number of encountered parsing errors */
-	u_int err;	
+	u_int err;
+	u_int non_fatal_err;
 
 	/* do we parse also statements */
 	bool parse_also;