From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 21 Sep 2018 08:55:34 +0000 (+0200)
Subject: android: Fix implementation of change_state() method in Android IMC
X-Git-Tag: 5.7.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a6426082a83d81f65962797cf382d2ce50b534e;p=thirdparty%2Fstrongswan.git

android: Fix implementation of change_state() method in Android IMC

The signature was changed with 731e043c8e07 ("libimcv: Reset of IMC state for
new measurement cycle").
---

diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.c b/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.c
index 6179bd516e..6a0415788a 100644
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.c
@@ -116,10 +116,14 @@ METHOD(imc_state_t, get_contracts, seg_contract_manager_t*,
 	return this->contracts;
 }
 
-METHOD(imc_state_t, change_state, void,
+METHOD(imc_state_t, change_state, TNC_ConnectionState,
 	private_imc_android_state_t *this, TNC_ConnectionState new_state)
 {
+	TNC_ConnectionState old;
+
+	old = this->state;
 	this->state = new_state;
+	return old;
 }
 
 METHOD(imc_state_t, set_result, void,