denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

full support of ikev1 and ikev2 connection flags

Browse Source
This commit is contained in:
Andreas Steffen
2006-05-30 11:10:42 +00:00
parent 9db4f61476
commit 6d5e617f7d
8 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/starter.c
+12 -8
View File
@@ -568,13 +568,15 @@ int main (int argc, char **argv)
if (conn->startup == STARTUP_START)
{
if (starter_charon_pid())
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
{
starter_stroke_initiate_conn(conn);
if (starter_charon_pid())
{
starter_stroke_initiate_conn(conn);
}
}
if (conn->keyexchange != KEY_EXCHANGE_IKEV2)
else
{
/* currently not initiated, until pluto handles the keyexchange flag */
if (starter_pluto_pid())
{
starter_whack_initiate_conn(conn);
@@ -583,13 +585,15 @@ int main (int argc, char **argv)
}
else if (conn->startup == STARTUP_ROUTE)
{
if (starter_charon_pid())
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
{
starter_stroke_route_conn(conn);
if (starter_charon_pid())
{
starter_stroke_route_conn(conn);
}
}
if (conn->keyexchange != KEY_EXCHANGE_IKEV2)
else
{
/* currently not routed, until pluto handles the keyexchange flag */
if (starter_pluto_pid())
{
starter_whack_route_conn(conn);
src/starter/starterwhack.c
+1
View File
@@ -234,6 +234,7 @@ starter_whack_add_conn(starter_conn_t *conn)
msg.whack_connection = TRUE;
msg.name = connection_name(conn);
msg.ikev1 = conn->keyexchange != KEY_EXCHANGE_IKEV2;
msg.addr_family = conn->addr_family;
msg.tunnel_addr_family = conn->tunnel_addr_family;
msg.sa_ike_life_seconds = conn->sa_ike_life_seconds;