aboutsummaryrefslogtreecommitdiffstats
path: root/src/starter/starter.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/starter/starter.c')
-rw-r--r--src/starter/starter.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 44e21431c..15c50c44b 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -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())
{