Do not ignore configs for IKEv1 in charon anymore

This commit is contained in:
Martin Willi
2012-03-20 17:30:43 +01:00
parent 558f79f76d
commit cf1772f685
6 changed files with 8 additions and 49 deletions
+6 -12
View File
@@ -764,14 +764,11 @@ int main (int argc, char **argv)
if (conn->startup == STARTUP_START)
{
if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_initiate_conn(conn);
}
starter_stroke_initiate_conn(conn);
}
else
if (conn->keyexchange == KEY_EXCHANGE_IKEV1)
{
if (starter_pluto_pid())
{
@@ -781,14 +778,11 @@ int main (int argc, char **argv)
}
else if (conn->startup == STARTUP_ROUTE)
{
if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_route_conn(conn);
}
starter_stroke_route_conn(conn);
}
else
if (conn->keyexchange == KEY_EXCHANGE_IKEV1)
{
if (starter_pluto_pid())
{