aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/tools
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-04-17 05:59:23 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-04-17 05:59:23 +0200
commit140fb395dcb23a9d2fef24789796f5d985569a06 (patch)
treecaf8d4f406dac00949d368a9272fe4ba71ef5c47 /app/tools
parentRemove sloppy java with enterprise java horrors (diff)
downloadwireguard-android-140fb395dcb23a9d2fef24789796f5d985569a06.tar.xz
wireguard-android-140fb395dcb23a9d2fef24789796f5d985569a06.zip
GoBackend: default MTU is 1280
This sucks, but it works with mobile networks. Later we can do something sophisticated like we do with wg-quick.c, but not now. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/tools')
-rw-r--r--app/tools/libwg-go/api-android.go4
-rw-r--r--app/tools/libwg-go/jni.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/app/tools/libwg-go/api-android.go b/app/tools/libwg-go/api-android.go
index b283d3ad..08367b9c 100644
--- a/app/tools/libwg-go/api-android.go
+++ b/app/tools/libwg-go/api-android.go
@@ -30,7 +30,7 @@ func init() {
}
//export wgTurnOn
-func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
+func wgTurnOn(ifnameRef string, tun_fd int32, mtu int32, settings string) int32 {
interfaceName := string([]byte(ifnameRef))
logger := &Logger{
@@ -48,7 +48,7 @@ func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
nopi: true,
}
device := NewDevice(tun, logger)
- device.tun.mtu = DefaultMTU //TODO: make dynamic
+ device.tun.mtu = mtu
bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard))
setError := ipcSetOperation(device, bufferedSettings)
diff --git a/app/tools/libwg-go/jni.c b/app/tools/libwg-go/jni.c
index 1476dab7..d32d64c4 100644
--- a/app/tools/libwg-go/jni.c
+++ b/app/tools/libwg-go/jni.c
@@ -1,12 +1,12 @@
#include <jni.h>
struct go_string { const char *str; long n; };
-extern int wgTurnOn(struct go_string ifname, int tun_fd, struct go_string settings);
+extern int wgTurnOn(struct go_string ifname, int tun_fd, int mtu, struct go_string settings);
extern void wgTurnOff(int handle);
extern int wgGetSocketV4(int handle);
extern int wgGetSocketV6(int handle);
-JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNIEnv *env, jclass c, jstring ifname, jint tun_fd, jstring settings)
+JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNIEnv *env, jclass c, jstring ifname, jint tun_fd, jint mtu, jstring settings)
{
const char *ifname_str = (*env)->GetStringUTFChars(env, ifname, 0);
size_t ifname_len = (*env)->GetStringUTFLength(env, ifname);
@@ -15,7 +15,7 @@ JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNI
int ret = wgTurnOn((struct go_string){
.str = ifname_str,
.n = ifname_len
- }, tun_fd, (struct go_string){
+ }, tun_fd, mtu, (struct go_string){
.str = settings_str,
.n = settings_len
});