From: Martin Willi Date: Mon, 9 Mar 2015 16:47:53 +0000 (+0100) Subject: Revert "ha: Always install the CHILD_SAs with the inbound flag set to FALSE" X-Git-Tag: 5.3.0dr1~16 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8be21ae7ef5844275abee3241771101224816f74;p=thirdparty%2Fstrongswan.git 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. --- diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c index 81132b4929..983f9d8fc1 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,