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

- changed config load strategy:

Browse Source 
starter loads both connections in charon & pluto,
  charon ignores anything with keyexchange!=ikev2.
  pluto needs the same behavior.
This commit is contained in:
Martin Willi
2006-05-23 10:07:02 +00:00
parent de1584de40
commit 7ba69503aa
7 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/starter.c
+22 -44
View File
@@ -331,20 +331,14 @@ int main (int argc, char **argv)
{
if (conn->state == STATE_ADDED)
{
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_del_conn(conn);
}
starter_stroke_del_conn(conn);
}
else
if (starter_pluto_pid())
{
if (starter_pluto_pid())
{
starter_whack_del_conn(conn);
conn->state = STATE_TO_ADD;
}
starter_whack_del_conn(conn);
conn->state = STATE_TO_ADD;
}
}
}
@@ -418,19 +412,13 @@ int main (int argc, char **argv)
{
if (conn->state == STATE_ADDED)
{
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_del_conn(conn);
}
starter_stroke_del_conn(conn);
}
else
if (starter_pluto_pid())
{
if (starter_pluto_pid())
{
starter_whack_del_conn(conn);
}
starter_whack_del_conn(conn);
}
}
}
@@ -568,33 +556,25 @@ int main (int argc, char **argv)
/* affect new unique id */
conn->id = id++;
}
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_add_conn(conn);
}
starter_stroke_add_conn(conn);
}
else
if (starter_pluto_pid())
{
if (starter_pluto_pid())
{
starter_whack_add_conn(conn);
}
starter_whack_add_conn(conn);
}
conn->state = STATE_ADDED;
if (conn->startup == STARTUP_START)
{
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_initiate_conn(conn);
}
starter_stroke_initiate_conn(conn);
}
else
if (conn->keyexchange != KEY_EXCHANGE_IKEV2)
{
/* currently not initiated, until pluto handles the keyexchange flag */
if (starter_pluto_pid())
{
starter_whack_initiate_conn(conn);
@@ -603,18 +583,16 @@ int main (int argc, char **argv)
}
else if (conn->startup == STARTUP_ROUTE)
{
if (conn->keyexchange == KEY_EXCHANGE_IKEV2)
if (starter_charon_pid())
{
if (starter_charon_pid())
{
starter_stroke_route_conn(conn);
}
starter_stroke_route_conn(conn);
}
else
if (conn->keyexchange != KEY_EXCHANGE_IKEV2)
{
/* currently not routed, until pluto handles the keyexchange flag */
if (starter_pluto_pid())
{
starter_whack_route_conn(conn);
starter_whack_route_conn(conn);
}
}
}
src/starter/starterstroke.c
+1
View File
@@ -125,6 +125,7 @@ starter_stroke_add_conn(starter_conn_t *conn)
msg->type = STR_ADD_CONN;
msg->add_conn.name = push_string(&msg, connection_name(conn));
msg->add_conn.ikev2 = conn->keyexchange == KEY_EXCHANGE_IKEV2 ? 1 : 0;
msg->add_conn.me.id = push_string(&msg, conn->left.id);
msg->add_conn.me.cert = push_string(&msg, conn->left.cert);