diff options
author | Tobias Brunner <tobias@strongswan.org> | 2015-06-16 16:44:29 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2015-07-28 13:27:33 +0200 |
commit | cda167c8c46d10c5d5f22bc6ace6c9183ed161fd (patch) | |
tree | f5a21bb67277f19477501bb95f26690d2a1b79e2 | |
parent | 6c0ec35c538561c0bdbcf765d94e33d5390dbbe3 (diff) | |
download | strongswan-cda167c8c46d10c5d5f22bc6ace6c9183ed161fd.tar.bz2 strongswan-cda167c8c46d10c5d5f22bc6ace6c9183ed161fd.tar.xz |
android: Apply configured server port
-rw-r--r-- | src/frontends/android/jni/libandroidbridge/backend/android_service.c | 5 | ||||
-rw-r--r-- | src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/jni/libandroidbridge/backend/android_service.c index 34fe4dac9..7ef3913f7 100644 --- a/src/frontends/android/jni/libandroidbridge/backend/android_service.c +++ b/src/frontends/android/jni/libandroidbridge/backend/android_service.c @@ -681,11 +681,14 @@ static job_requeue_t initiate(private_android_service_t *this) } }; char *type, *server; + int port; server = this->settings->get_str(this->settings, "connection.server", NULL); + port = this->settings->get_int(this->settings, "connection.port", + IKEV2_UDP_PORT); ike_cfg = ike_cfg_create(IKEV2, TRUE, TRUE, "0.0.0.0", charon->socket->get_port(charon->socket, FALSE), - server, IKEV2_UDP_PORT, FRAGMENTATION_YES, 0); + server, port, FRAGMENTATION_YES, 0); ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE)); ike_cfg->add_proposal(ike_cfg, proposal_create_default_aead(PROTO_IKE)); diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java index ffe14491c..236e759f8 100644 --- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java @@ -222,6 +222,7 @@ public class CharonVpnService extends VpnService implements Runnable writer.setValue("global.mtu", mCurrentProfile.getMTU()); writer.setValue("connection.type", mCurrentProfile.getVpnType().getIdentifier()); writer.setValue("connection.server", mCurrentProfile.getGateway()); + writer.setValue("connection.port", mCurrentProfile.getPort()); writer.setValue("connection.username", mCurrentProfile.getUsername()); writer.setValue("connection.password", mCurrentProfile.getPassword()); initiate(writer.serialize()); |