From 8be21ae7ef5844275abee3241771101224816f74 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 9 Mar 2015 17:47:53 +0100 Subject: [PATCH] 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. --- src/libcharon/plugins/ha/ha_dispatcher.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c index 81132b4..983f9d8 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, -- 2.7.4