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

Revert "ha: Always install the CHILD_SAs with the inbound flag set to FALSE"

Browse Source 
While this change results in the correct add/update flag during installation,
it exchanges all other values in the child_sa->install() call. We should pass
the correct flag, but determine the add/update flag by other means.

This reverts commit e722ee5d.
This commit is contained in:
Martin Willi
2015-03-09 18:18:20 +01:00
parent ab65a3e8fc
commit 8be21ae7ef
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_dispatcher.c
+2 -2
View File
@@ -792,7 +792,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
if (initiator) if (initiator)
{ {
if (child_sa->install(child_sa, encr_r, integ_r, inbound_spi, if (child_sa->install(child_sa, encr_r, integ_r, inbound_spi,
inbound_cpi, initiator, FALSE, TRUE, inbound_cpi, initiator, TRUE, TRUE,
local_ts, remote_ts) != SUCCESS || local_ts, remote_ts) != SUCCESS ||
child_sa->install(child_sa, encr_i, integ_i, outbound_spi, child_sa->install(child_sa, encr_i, integ_i, outbound_spi,
outbound_cpi, initiator, FALSE, TRUE, outbound_cpi, initiator, FALSE, TRUE,
@@ -804,7 +804,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
else else
{ {
if (child_sa->install(child_sa, encr_i, integ_i, inbound_spi, if (child_sa->install(child_sa, encr_i, integ_i, inbound_spi,
inbound_cpi, initiator, FALSE, TRUE, inbound_cpi, initiator, TRUE, TRUE,
local_ts, remote_ts) != SUCCESS || local_ts, remote_ts) != SUCCESS ||
child_sa->install(child_sa, encr_r, integ_r, outbound_spi, child_sa->install(child_sa, encr_r, integ_r, outbound_spi,
outbound_cpi, initiator, FALSE, TRUE, outbound_cpi, initiator, FALSE, TRUE,