full support of ikev1 and ikev2 connection flags

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
+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);