aboutsummaryrefslogtreecommitdiffstats
path: root/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-10-18 12:28:14 +0200
committerTobias Brunner <tobias@strongswan.org>2012-10-18 12:28:14 +0200
commit8bd00205f4f3c0c57eaf49f4d281f52befa9a855 (patch)
treecf6ac06017a3d99ee3f93420072d9902922ff5cf /src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
parentbbf90fcc79ce5de807136263713fcf48033a3bc7 (diff)
parent25a413cb96f9711411dd1590d62d323098c267e0 (diff)
downloadstrongswan-8bd00205f4f3c0c57eaf49f4d281f52befa9a855.tar.bz2
strongswan-8bd00205f4f3c0c57eaf49f4d281f52befa9a855.tar.xz
Merge branch 'android-mobility'
This brings support for MOBIKE to the Android app. The app also tries to keep the connection up as long as possible. DNS queries are now handled by a new class that uses independent threads to resolve them, this allows to cancel them e.g. if no network connectivity is available (otherwise the app would block until the DNS query returns).
Diffstat (limited to 'src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c')
-rw-r--r--src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
index 08cc61610..85fe5d4c1 100644
--- a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
+++ b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
@@ -79,7 +79,8 @@ METHOD(kernel_ipsec_t, update_sa, status_t,
u_int16_t cpi, host_t *src, host_t *dst, host_t *new_src, host_t *new_dst,
bool encap, bool new_encap, mark_t mark)
{
- return NOT_SUPPORTED;
+ return ipsec->sas->update_sa(ipsec->sas, spi, protocol, cpi, src, dst,
+ new_src, new_dst, encap, new_encap, mark);
}
METHOD(kernel_ipsec_t, query_sa, status_t,