Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Determine MTU automatically

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-04-18 16:44:05 +02:00
parent ed42e30069
commit 80f22e6c3d
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/wireguard/android/backend/GoBackend.java
View File

@ -73,7 +73,7 @@ public final class GoBackend implements Backend {
private static native void wgTurnOff(int handle); private static native void wgTurnOff(int handle);
private static native int wgTurnOn(String ifName, int tunFd, int mtu, String settings); private static native int wgTurnOn(String ifName, int tunFd, String settings);
@Override @Override
public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception { public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
@ -196,7 +196,7 @@ public final class GoBackend implements Backend {
if (tun == null) if (tun == null)
throw new Exception("Unable to create tun device"); throw new Exception("Unable to create tun device");
currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), mtu, fmt.toString()); currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), fmt.toString());
if (currentTunnelHandle < 0) if (currentTunnelHandle < 0)
throw new Exception("Unable to turn tunnel on (wgTurnOn return " + currentTunnelHandle + ")"); throw new Exception("Unable to turn tunnel on (wgTurnOn return " + currentTunnelHandle + ")");

12
app/tools/libwg-go/api-android.go
View File

@ -30,7 +30,7 @@ func init() {
} }
//export wgTurnOn //export wgTurnOn
func wgTurnOn(ifnameRef string, tun_fd int32, mtu int32, settings string) int32 { func wgTurnOn(ifnameRef string, tun_fd int32, settings string) int32 {
interfaceName := string([]byte(ifnameRef)) interfaceName := string([]byte(ifnameRef))
logger := &Logger{ logger := &Logger{
@ -47,13 +47,19 @@ func wgTurnOn(ifnameRef string, tun_fd int32, mtu int32, settings string) int32
errors: make(chan error, 5), errors: make(chan error, 5),
nopi: true, nopi: true,
} }
name, err := tun.Name()
if err != nil {
logger.Error.Println(err)
return -1
}
logger.Info.Println("Attaching to interface", name)
device := NewDevice(tun, logger) device := NewDevice(tun, logger)
device.tun.mtu = mtu logger.Debug.Println("Interface has MTU", device.tun.mtu)
bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard)) bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard))
setError := ipcSetOperation(device, bufferedSettings) setError := ipcSetOperation(device, bufferedSettings)
if setError != nil { if setError != nil {
logger.Debug.Println(setError) logger.Error.Println(setError)
return -1 return -1
} }

6
app/tools/libwg-go/jni.c
View File

@ -1,12 +1,12 @@
#include <jni.h> #include <jni.h>
struct go_string { const char *str; long n; }; struct go_string { const char *str; long n; };
extern int wgTurnOn(struct go_string ifname, int tun_fd, int mtu, struct go_string settings); extern int wgTurnOn(struct go_string ifname, int tun_fd, struct go_string settings);
extern void wgTurnOff(int handle); extern void wgTurnOff(int handle);
extern int wgGetSocketV4(int handle); extern int wgGetSocketV4(int handle);
extern int wgGetSocketV6(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, jint mtu, jstring settings) JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNIEnv *env, jclass c, jstring ifname, jint tun_fd, jstring settings)
{ {
const char *ifname_str = (*env)->GetStringUTFChars(env, ifname, 0); const char *ifname_str = (*env)->GetStringUTFChars(env, ifname, 0);
size_t ifname_len = (*env)->GetStringUTFLength(env, ifname); 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){ int ret = wgTurnOn((struct go_string){
.str = ifname_str, .str = ifname_str,
.n = ifname_len .n = ifname_len
}, tun_fd, mtu, (struct go_string){ }, tun_fd, (struct go_string){
.str = settings_str, .str = settings_str,
.n = settings_len .n = settings_len
}); });

2
app/tools/wireguard-go

@ -1 +1 @@
Subproject commit c68acf44c0e8874af66139bda7a8e1fc167fc6ea Subproject commit 26a56a652eeeece7677ba4f1896da34c83930652