diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-17 11:59:52 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-17 11:59:52 -0300 |
| commit | 0b9ad2949ccfba7f4f7c1369dbc8fd158c528d1e (patch) | |
| tree | 7e91f08aaf51992d4dffc509c424ae4a6b733feb | |
| parent | 07ec7518135741c91ef2c309c013e037790945e4 (diff) | |
| parent | 66e69efbc0fcba91ec17cfc48781900e489cf8ba (diff) | |
| download | mullvadvpn-0b9ad2949ccfba7f4f7c1369dbc8fd158c528d1e.tar.xz mullvadvpn-0b9ad2949ccfba7f4f7c1369dbc8fd158c528d1e.zip | |
Merge branch 'fix-wg-go-usage-on-android'
| -rw-r--r-- | wireguard/libwg/go.mod | 2 | ||||
| -rw-r--r-- | wireguard/libwg/libwg_android.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wireguard/libwg/go.mod b/wireguard/libwg/go.mod index fe5a9011f5..aaf70b326e 100644 --- a/wireguard/libwg/go.mod +++ b/wireguard/libwg/go.mod @@ -1,6 +1,6 @@ module github.com/mullvad/mullvadvpn-app/wireguard/libwg -go 1.13 +go 1.16 require ( golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect diff --git a/wireguard/libwg/libwg_android.go b/wireguard/libwg/libwg_android.go index e5c7eb5fe3..df54d4cc8b 100644 --- a/wireguard/libwg/libwg_android.go +++ b/wireguard/libwg/libwg_android.go @@ -47,7 +47,7 @@ func wgTurnOn(cSettings *C.char, fd int, logSink LogSink, logContext LogContext) return ERROR_GENERAL_FAILURE } - device := device.NewDevice(tunDevice, conn.NewDefaultBind(), logger) + device := device.NewDevice(tunDevice, conn.NewStdNetBind(), logger) setErr := device.IpcSetOperation(bufio.NewReader(strings.NewReader(settings))) if setErr != nil { |