- changed config load strategy:

starter loads both connections in charon & pluto,
  charon ignores anything with keyexchange!=ikev2.
  pluto needs the same behavior.

src/stroke/stroke.c

@@ -104,6 +104,7 @@ static int add_connection(char *name,
 	msg->type = STR_ADD_CONN;
 	
 	msg->add_conn.name = push_string(&msg, name);
+	msg->add_conn.ikev2 = 1;
 	
 	msg->add_conn.me.id = push_string(&msg, my_id);
 	msg->add_conn.me.address = push_string(&msg, my_addr);

src/stroke/stroke.h

@@ -71,12 +71,14 @@ struct stroke_msg_t {
 		/* data for STR_ADD_CONN */
 		struct {
 			char *name;
+			/* is this connection handled by charon? */
+			int ikev2;
 			struct {
 				char *id;
 				char *cert;
 				char *address;
 				char *subnet;
-				u_int8_t subnet_mask;
+				int subnet_mask;
 			} me, other;
 		} add_conn;
 		struct {
@@ -86,10 +88,9 @@ struct stroke_msg_t {
 		} logtype;
 		struct {
 			char *context;
-			u_int level;
+			int level;
 		} loglevel;
 	};
-
 	u_int8_t buffer[];
 };