diff options
| author | Martin Willi <martin@revosec.ch> | 2015-03-09 17:47:53 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-03-09 18:18:20 +0100 |
| commit | 8be21ae7ef5844275abee3241771101224816f74 (patch) | |
| tree | 0348b5cf606127d99124f721f84b854f4a8d6205 | |
| parent | ab65a3e8fc1a3ca4c6e72e11af84d2f51abf6db9 (diff) | |
| download | strongswan-8be21ae7ef5844275abee3241771101224816f74.tar.bz2 strongswan-8be21ae7ef5844275abee3241771101224816f74.tar.xz | |
Revert "ha: Always install the CHILD_SAs with the inbound flag set to FALSE"
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.
| -rw-r--r-- | src/libcharon/plugins/ha/ha_dispatcher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c index 81132b492..983f9d8fc 100644 --- a/src/libcharon/plugins/ha/ha_dispatcher.c +++ b/src/libcharon/plugins/ha/ha_dispatcher.c @@ -792,7 +792,7 @@ static void process_child_add(private_ha_dispatcher_t *this, if (initiator) { 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 || child_sa->install(child_sa, encr_i, integ_i, outbound_spi, outbound_cpi, initiator, FALSE, TRUE, @@ -804,7 +804,7 @@ static void process_child_add(private_ha_dispatcher_t *this, else { 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 || child_sa->install(child_sa, encr_r, integ_r, outbound_spi, outbound_cpi, initiator, FALSE, TRUE, |