From: Martin Willi <martin@revosec.ch>
Date: Fri, 17 Oct 2014 13:44:06 +0000 (+0200)
Subject: child-sa: Remove the obsolete update logic
X-Git-Tag: 5.3.0dr1~81^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=698ed656;p=thirdparty%2Fstrongswan.git

child-sa: Remove the obsolete update logic

The kernel backend uses an inbound parameter these days, where it makes
no sense to pass the update flag. The kernel backend decides itself how
it handles SA installation based on the inbound flag.
---

diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
index ed9e9b0873..6f5e046c56 100644
--- a/src/libcharon/sa/child_sa.c
+++ b/src/libcharon/sa/child_sa.c
@@ -639,7 +639,6 @@ METHOD(child_sa_t, install, status_t,
 	u_int32_t tfc = 0;
 	host_t *src, *dst;
 	status_t status;
-	bool update = FALSE;
 
 	/* now we have to decide which spi to use. Use self allocated, if "in",
 	 * or the one in the proposal, if not "in" (others). Additionally,
@@ -648,10 +647,6 @@ METHOD(child_sa_t, install, status_t,
 	{
 		dst = this->my_addr;
 		src = this->other_addr;
-		if (this->my_spi == spi)
-		{	/* alloc_spi has been called, do an SA update */
-			update = TRUE;
-		}
 		this->my_spi = spi;
 		this->my_cpi = cpi;
 	}
@@ -722,7 +717,7 @@ METHOD(child_sa_t, install, status_t,
 				inbound ? this->mark_in : this->mark_out, tfc,
 				lifetime, enc_alg, encr, int_alg, integ, this->mode,
 				this->ipcomp, cpi, this->config->get_replay_window(this->config),
-				initiator, this->encap, esn, update, src_ts, dst_ts);
+				initiator, this->encap, esn, inbound, src_ts, dst_ts);
 
 	free(lifetime);