aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2015-03-09 17:44:55 +0100
committerMartin Willi <martin@revosec.ch>2015-03-09 18:18:20 +0100
commit68e5ada0058a52a402966b616a73a290053a210d (patch)
tree1583391ae005f2aad54051f6b9aca27cff843206 /src
parentacad5e9f512cca4141e8067789d9b421a36cf191 (diff)
downloadstrongswan-68e5ada0058a52a402966b616a73a290053a210d.tar.bz2
strongswan-68e5ada0058a52a402966b616a73a290053a210d.tar.xz
tkm: Use the inbound flag do determine peer role in CHILD_SA exchange
This was not available during initial implementation, but fits just fine to avoid reconstructing the peer role.
Diffstat (limited to 'src')
-rw-r--r--src/charon-tkm/src/tkm/tkm_kernel_ipsec.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
index a62e2b150..69341a4f5 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
+++ b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
@@ -86,11 +86,10 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
u_int32_t tfc, lifetime_cfg_t *lifetime, u_int16_t enc_alg, chunk_t enc_key,
u_int16_t int_alg, chunk_t int_key, ipsec_mode_t mode,
u_int16_t ipcomp, u_int16_t cpi, u_int32_t replay_window,
- bool _initiator, bool encap, bool esn, bool inbound,
+ bool initiator, bool encap, bool esn, bool inbound,
linked_list_t* src_ts, linked_list_t* dst_ts)
{
esa_info_t esa;
- bool initiator;
esp_spi_type spi_loc, spi_rem;
host_t *local, *peer;
chunk_t *nonce_loc, *nonce_rem;
@@ -113,9 +112,6 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
return SUCCESS;
}
- /* Initiator if encr_r is passed as enc_key to the inbound add_sa call */
- /* TODO: does the new _initiator parameter have the same meaning? */
- initiator = esa.is_encr_r && inbound;
if (initiator)
{
spi_loc = spi;