aboutsummaryrefslogtreecommitdiffstats
path: root/src/frontends/android/jni
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2014-10-15 17:22:55 +0200
committerMartin Willi <martin@revosec.ch>2015-02-20 13:34:32 +0100
commit2a1c9e20bd38572ba32ba57436d7064192680729 (patch)
tree7d9e68869111c8a07490d89f0de270e1e8b9edf3 /src/frontends/android/jni
parent3e779ff555f9ce27c23425162233ba0b8761ac5c (diff)
downloadstrongswan-2a1c9e20bd38572ba32ba57436d7064192680729.tar.bz2
strongswan-2a1c9e20bd38572ba32ba57436d7064192680729.tar.xz
kernel-interface: Remove reqid parameter from get_spi/get_cpi() methods
The reqid is not strictly required, as we set the reqid with the update call when installing the negotiated SA. If we don't need a reqid at this stage, we can later allocate the reqid in the kernel backend once the SA parameters have been fully negotaited. This allows us to assign the same reqid for the same selectors to avoid conflicts on backends this is necessary.
Diffstat (limited to 'src/frontends/android/jni')
-rw-r--r--src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
index 84b3b600d..d2a45da82 100644
--- a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
+++ b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
@@ -48,14 +48,14 @@ void expire(u_int32_t reqid, u_int8_t protocol, u_int32_t spi, bool hard)
METHOD(kernel_ipsec_t, get_spi, status_t,
private_kernel_android_ipsec_t *this, host_t *src, host_t *dst,
- u_int8_t protocol, u_int32_t reqid, u_int32_t *spi)
+ u_int8_t protocol, u_int32_t *spi)
{
return ipsec->sas->get_spi(ipsec->sas, src, dst, protocol, spi);
}
METHOD(kernel_ipsec_t, get_cpi, status_t,
private_kernel_android_ipsec_t *this, host_t *src, host_t *dst,
- u_int32_t reqid, u_int16_t *cpi)
+ u_int16_t *cpi)
{
return NOT_SUPPORTED;
}