summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2018-12-05 13:36:52 +0100
committerArne Schwabe <arne@rfc2549.org>2018-12-05 13:36:52 +0100
commit34b4155aef30ab5c5be666530bc1a97b87e0f068 (patch)
treef1c39fb26ecade00152adc08ec8095a65ba09a99 /main
parent5165a1b2f377f9ef31e51b4ebf1b6e612ea3e374 (diff)
Import new OpenVPN versions
Diffstat (limited to 'main')
m---------main/src/main/cpp/openvpn0
m---------main/src/main/cpp/openvpn30
-rw-r--r--main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java2
3 files changed, 1 insertions, 1 deletions
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject b98840e2d848fb0aed9cbe98aa956d28d6f2f6f
+Subproject bb481e41ebfe6879a2bcbc0fea492c2c2e9fcfb
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject c38c7a0bd3a29a047fe0eb95cc365d0fe19345a
+Subproject c49d78bf42318245fa45444422be9d71ea21978
diff --git a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
index 08f7a156..bb511c6d 100644
--- a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -245,7 +245,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
}
@Override
- public boolean socket_protect(int socket) {
+ public boolean socket_protect(int socket, String remote, boolean ipv6) {
boolean b= mService.protect(socket);
return b;