From 0a55a284d5edcb792848448b5415e4faea437038 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 6 Nov 2018 15:46:44 +0100 Subject: wireguard-go-bridge: take fd instead of fnptr Signed-off-by: Jason A. Donenfeld --- wireguard-go-bridge/src/api-ios.go | 12 +++-- wireguard-go-bridge/src/queueconstants.go | 10 ++-- wireguard-go-bridge/src/tun/api-ios.go | 52 ++++++++++++++++++ wireguard-go-bridge/src/tun/tun_ios.go | 90 ------------------------------- wireguard-go-bridge/wireguard.h | 3 +- 5 files changed, 65 insertions(+), 102 deletions(-) create mode 100644 wireguard-go-bridge/src/tun/api-ios.go delete mode 100644 wireguard-go-bridge/src/tun/tun_ios.go (limited to 'wireguard-go-bridge') diff --git a/wireguard-go-bridge/src/api-ios.go b/wireguard-go-bridge/src/api-ios.go index 07dd45a..67ce785 100644 --- a/wireguard-go-bridge/src/api-ios.go +++ b/wireguard-go-bridge/src/api-ios.go @@ -15,6 +15,7 @@ import "C" import ( "bufio" + "errors" "git.zx2c4.com/wireguard-go/tun" "golang.org/x/sys/unix" "io/ioutil" @@ -25,7 +26,6 @@ import ( "runtime" "strings" "unsafe" - "errors" ) var loggerFunc unsafe.Pointer @@ -75,7 +75,7 @@ func wgSetLogger(loggerFn uintptr) { } //export wgTurnOn -func wgTurnOn(ifnameRef string, settings string, mtu uint16, readFn uintptr, writeFn uintptr, ctx uintptr) int32 { +func wgTurnOn(ifnameRef string, settings string, tunFd int32) int32 { interfaceName := string([]byte(ifnameRef)) logger := &Logger{ @@ -86,12 +86,14 @@ func wgTurnOn(ifnameRef string, settings string, mtu uint16, readFn uintptr, wri logger.Debug.Println("Debug log enabled") - tun := tun.CreateTUN(mtu, unsafe.Pointer(readFn), unsafe.Pointer(writeFn), unsafe.Pointer(ctx)) + tun, _, err := tun.CreateTUNFromFD(int(tunFd)) + if err != nil { + logger.Error.Println(err) + return -1 + } logger.Info.Println("Attaching to interface") device := NewDevice(tun, logger) - logger.Debug.Println("Interface has MTU", device.tun.mtu) - bufferedSettings := bufio.NewReadWriter(bufio.NewReader(strings.NewReader(settings)), bufio.NewWriter(ioutil.Discard)) setError := ipcSetOperation(device, bufferedSettings) if setError != nil { diff --git a/wireguard-go-bridge/src/queueconstants.go b/wireguard-go-bridge/src/queueconstants.go index 410af14..133d4f3 100644 --- a/wireguard-go-bridge/src/queueconstants.go +++ b/wireguard-go-bridge/src/queueconstants.go @@ -8,9 +8,9 @@ package main /* Fit within memory limits for iOS */ const ( - QueueOutboundSize = 1024 - QueueInboundSize = 1024 - QueueHandshakeSize = 1024 - MaxSegmentSize = 1700 - PreallocatedBuffersPerPool = 1024 + QueueOutboundSize = 1024 + QueueInboundSize = 1024 + QueueHandshakeSize = 1024 + MaxSegmentSize = 1700 + PreallocatedBuffersPerPool = 1024 ) diff --git a/wireguard-go-bridge/src/tun/api-ios.go b/wireguard-go-bridge/src/tun/api-ios.go new file mode 100644 index 0000000..476669f --- /dev/null +++ b/wireguard-go-bridge/src/tun/api-ios.go @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2017-2018 Jason A. Donenfeld . All Rights Reserved. + */ + +package tun + +import ( + "git.zx2c4.com/wireguard-go/rwcancel" + "golang.org/x/sys/unix" + "net" + "os" +) + +func CreateTUNFromFD(tunFd int) (TUNDevice, string, error) { + file := os.NewFile(uintptr(tunFd), "/dev/tun") + tun := &nativeTun{ + tunFile: file, + fd: file.Fd(), + events: make(chan TUNEvent, 5), + errors: make(chan error, 5), + } + var err error + tun.rwcancel, err = rwcancel.NewRWCancel(tunFd) + if err != nil { + return nil, "", err + } + name, err := tun.Name() + if err != nil { + tun.rwcancel.Cancel() + return nil, "", err + } + tunIfindex, err := func() (int, error) { + iface, err := net.InterfaceByName(name) + if err != nil { + return -1, err + } + return iface.Index, nil + }() + if err != nil { + tun.tunFile.Close() + return nil, "", err + } + tun.routeSocket, err = unix.Socket(unix.AF_ROUTE, unix.SOCK_RAW, unix.AF_UNSPEC) + if err != nil { + tun.tunFile.Close() + return nil, "", err + } + go tun.routineRouteListener(tunIfindex) + + return tun, name, nil +} diff --git a/wireguard-go-bridge/src/tun/tun_ios.go b/wireguard-go-bridge/src/tun/tun_ios.go deleted file mode 100644 index cafe33b..0000000 --- a/wireguard-go-bridge/src/tun/tun_ios.go +++ /dev/null @@ -1,90 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 - * - * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. - */ - -package tun - -// #include -// static ssize_t callFnWithCtx(const void *func, const void *ctx, const void *buffer, size_t len) -// { -// return ((ssize_t(*)(const void *, const unsigned char *, size_t))func)(ctx, buffer, len); -// } -import "C" - -import ( - "os" - "syscall" - "unsafe" -) - -type nativeTun struct { - events chan TUNEvent - mtu int - readFn unsafe.Pointer - writeFn unsafe.Pointer - ctx unsafe.Pointer -} - -func CreateTUN(mtu uint16, readFn unsafe.Pointer, writeFn unsafe.Pointer, ctx unsafe.Pointer) TUNDevice { - if mtu == 0 { - /* 0 means automatic MTU, which iOS makes outerMTU-80-15. The 80 is for - * WireGuard and the 15 ensures our padding will work. Therefore, it's - * safe to have this code assume a massive MTU. - */ - mtu = ^mtu - } - tun := &nativeTun{ - events: make(chan TUNEvent, 10), - mtu: int(mtu), - readFn: readFn, - writeFn: writeFn, - ctx: ctx, - } - tun.events <- TUNEventUp - return tun -} - -func (tun *nativeTun) Name() (string, error) { - return "tun", nil -} - -func (tun *nativeTun) File() *os.File { - return nil -} - -func (tun *nativeTun) Events() chan TUNEvent { - return tun.events -} - -func (tun *nativeTun) Read(buff []byte, offset int) (int, error) { - ret := C.callFnWithCtx(tun.readFn, tun.ctx, unsafe.Pointer(&buff[offset]), C.size_t(len(buff) - offset)) - if ret < 0 { - return 0, syscall.Errno(-ret) - } - return int(ret), nil -} - -func (tun *nativeTun) Write(buff []byte, offset int) (int, error) { - ret := C.callFnWithCtx(tun.writeFn, tun.ctx, unsafe.Pointer(&buff[offset]), C.size_t(len(buff) - offset)) - if ret < 0 { - return 0, syscall.Errno(-ret) - } - return int(ret), nil -} - -func (tun *nativeTun) Close() error { - if tun.events != nil { - close(tun.events) - } - return nil -} - -func (tun *nativeTun) setMTU(n int) error { - tun.mtu = n - return nil -} - -func (tun *nativeTun) MTU() (int, error) { - return tun.mtu, nil -} diff --git a/wireguard-go-bridge/wireguard.h b/wireguard-go-bridge/wireguard.h index 8517bce..77d1661 100644 --- a/wireguard-go-bridge/wireguard.h +++ b/wireguard-go-bridge/wireguard.h @@ -10,10 +10,9 @@ #include typedef struct { const char *p; size_t n; } gostring_t; -typedef ssize_t(*read_write_fn_t)(void *ctx, unsigned char *buf, size_t len); typedef void(*logger_fn_t)(int level, const char *msg); extern void wgSetLogger(logger_fn_t logger_fn); -extern int wgTurnOn(gostring_t ifname, gostring_t settings, uint16_t mtu, read_write_fn_t read_fn, read_write_fn_t write_fn, void *ctx); +extern int wgTurnOn(gostring_t ifname, gostring_t settings, int32_t tun_fd); extern void wgTurnOff(int handle); extern char *wgVersion(); -- cgit v1.2.3-59-g8ed1b