diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2021-12-17 11:35:05 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2021-12-17 11:36:32 +0100 |
| commit | e9f7ad7501d3fc28ac6673d1e1205f51bab7baf0 (patch) | |
| tree | bbe7836f9ca247e9c4a15378aa88e3fa3922a967 | |
| parent | 4466103d770c353cfb8d4ea08093560ba28d58b8 (diff) | |
Import new OpenVPN3 version
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
| -rw-r--r-- | main/build.gradle.kts | 4 | ||||
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 2 | ||||
| m--------- | main/src/main/cpp/openvpn3 | 0 | ||||
| -rw-r--r-- | main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 9 |
4 files changed, 10 insertions, 5 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts index a075270e..e7863ff3 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -140,8 +140,8 @@ fun registerGenTask(variantName: String, variantDirName: String): File { commandLine(listOf(swigcmd, "-outdir", genDir, "-outcurrentdir", "-c++", "-java", "-package", "net.openvpn.ovpn3", "-Isrc/main/cpp/openvpn3/client", "-Isrc/main/cpp/openvpn3/", "-o", "${genDir}/ovpncli_wrap.cxx", "-oh", "${genDir}/ovpncli_wrap.h", - "src/main/cpp/openvpn3/javacli/ovpncli.i")) - inputs.files( "src/main/cpp/openvpn3/javacli/ovpncli.i") + "src/main/cpp/openvpn3/client/ovpncli.i")) + inputs.files( "src/main/cpp/openvpn3/client/ovpncli.i") outputs.dir( genDir) } diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt index 04520267..e9721e33 100644 --- a/main/src/main/cpp/CMakeLists.txt +++ b/main/src/main/cpp/CMakeLists.txt @@ -44,7 +44,7 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s -outcurrentdir -I${CMAKE_SOURCE_DIR}/openvpn3/client -I${CMAKE_SOURCE_DIR}/openvpn3 - ${CMAKE_SOURCE_DIR}/openvpn3/javacli/ovpncli.i) + ${CMAKE_SOURCE_DIR}/openvpn3/client/ovpncli.i) # proper way bunt unfinished diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3 -Subproject d07270962a013844c0f031b73fc5f1b439476d1 +Subproject 338d948183b48013fcd919c78d644509dd1fc80 diff --git a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java index b9ed9822..0db2f16d 100644 --- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java +++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java @@ -12,6 +12,7 @@ import net.openvpn.ovpn3.ClientAPI_ExternalPKICertRequest; import net.openvpn.ovpn3.ClientAPI_ExternalPKISignRequest; import net.openvpn.ovpn3.ClientAPI_LogInfo; import net.openvpn.ovpn3.ClientAPI_OpenVPNClient; +import net.openvpn.ovpn3.ClientAPI_OpenVPNClientHelper; import net.openvpn.ovpn3.ClientAPI_ProvideCreds; import net.openvpn.ovpn3.ClientAPI_Status; import net.openvpn.ovpn3.ClientAPI_TransportStats; @@ -33,6 +34,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable private VpnProfile mVp; private OpenVPNService mService; + private ClientAPI_OpenVPNClientHelper clientHelper = new ClientAPI_OpenVPNClientHelper(); public OpenVPNThreadv3(OpenVPNService openVpnService, VpnProfile vp) { mVp = vp; @@ -45,8 +47,11 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable if (!setConfig(configstr)) return; setUserPW(); - VpnStatus.logInfo(platform()); - VpnStatus.logInfo(copyright()); + + + + VpnStatus.logInfo(ClientAPI_OpenVPNClientHelper.platform()); + VpnStatus.logInfo(ClientAPI_OpenVPNClientHelper.copyright()); StatusPoller statuspoller = new StatusPoller(OpenVPNManagement.mBytecountInterval * 1000); |