diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-17 12:48:14 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:25 +0100 |
| commit | d94c923648a506f9abae431592ef4bfd6609a030 (patch) | |
| tree | 905051a3ab31774a5159be77be221093d09aa7b7 /src/starter | |
| parent | b9a707e696148fad420df508462abbaf734bc646 (diff) | |
| download | strongswan-d94c923648a506f9abae431592ef4bfd6609a030.tar.bz2 strongswan-d94c923648a506f9abae431592ef4bfd6609a030.tar.xz | |
Support an "any" IKE version for both IKEv1 or IKEv2
Diffstat (limited to 'src/starter')
| -rw-r--r-- | src/starter/confread.h | 7 | ||||
| -rw-r--r-- | src/starter/starterstroke.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/starter/confread.h b/src/starter/confread.h index 988b8ed48..47bd84603 100644 --- a/src/starter/confread.h +++ b/src/starter/confread.h @@ -39,9 +39,10 @@ typedef enum { } starter_state_t; typedef enum { - KEY_EXCHANGE_IKE, - KEY_EXCHANGE_IKEV1, - KEY_EXCHANGE_IKEV2 + /* shared with ike_version_t */ + KEY_EXCHANGE_IKE = 0, + KEY_EXCHANGE_IKEV1 = 1, + KEY_EXCHANGE_IKEV2 = 2, } keyexchange_t; typedef enum { diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c index 628d63214..c4d9fa2e9 100644 --- a/src/starter/starterstroke.c +++ b/src/starter/starterstroke.c @@ -196,7 +196,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn) memset(&msg, 0, sizeof(msg)); msg.type = STR_ADD_CONN; msg.length = offsetof(stroke_msg_t, buffer); - msg.add_conn.ikev2 = conn->keyexchange != KEY_EXCHANGE_IKEV1; + msg.add_conn.version = conn->keyexchange; msg.add_conn.name = push_string(&msg, connection_name(conn)); /* PUBKEY is preferred to PSK and EAP */ |