From accf60b82f29b3af930b372a2f401c299ceeb5c2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 21 Dec 2018 22:05:47 +0100 Subject: Do not require NetworkExtension to know its own name Signed-off-by: Jason A. Donenfeld --- wireguard-go-bridge/src/api-ios.go | 17 ++++++----------- wireguard-go-bridge/wireguard.h | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'wireguard-go-bridge') diff --git a/wireguard-go-bridge/src/api-ios.go b/wireguard-go-bridge/src/api-ios.go index 3d35d1e..902cfac 100644 --- a/wireguard-go-bridge/src/api-ios.go +++ b/wireguard-go-bridge/src/api-ios.go @@ -32,15 +32,14 @@ var loggerFunc unsafe.Pointer var versionString *C.char type CLogger struct { - level C.int - interfaceName string + level C.int } func (l *CLogger) Write(p []byte) (int, error) { if uintptr(loggerFunc) == 0 { return 0, errors.New("No logger initialized") } - message := C.CString(l.interfaceName + ": " + string(p)) + message := C.CString(string(p)) C.callLogger(loggerFunc, l.level, message) C.free(unsafe.Pointer(message)) return len(p), nil @@ -75,17 +74,13 @@ func wgSetLogger(loggerFn uintptr) { } //export wgTurnOn -func wgTurnOn(ifnameRef string, settings string, tunFd int32) int32 { - interfaceName := string([]byte(ifnameRef)) - +func wgTurnOn(settings string, tunFd int32) int32 { logger := &Logger{ - Debug: log.New(&CLogger{level: 0, interfaceName: interfaceName}, "", 0), - Info: log.New(&CLogger{level: 1, interfaceName: interfaceName}, "", 0), - Error: log.New(&CLogger{level: 2, interfaceName: interfaceName}, "", 0), + Debug: log.New(&CLogger{level: 0}, "", 0), + Info: log.New(&CLogger{level: 1}, "", 0), + Error: log.New(&CLogger{level: 2}, "", 0), } - logger.Debug.Println("Debug log enabled") - tun, _, err := tun.CreateTUNFromFD(int(tunFd)) if err != nil { logger.Error.Println(err) diff --git a/wireguard-go-bridge/wireguard.h b/wireguard-go-bridge/wireguard.h index fec352d..d7183c9 100644 --- a/wireguard-go-bridge/wireguard.h +++ b/wireguard-go-bridge/wireguard.h @@ -12,7 +12,7 @@ typedef struct { const char *p; size_t n; } gostring_t; 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, int32_t tun_fd); +extern int wgTurnOn(gostring_t settings, int32_t tun_fd); extern void wgTurnOff(int handle); extern int64_t wgSetConfig(int handle, gostring_t settings); extern uint16_t wgGetListenPort(int handle); -- cgit v1.2.3-59-g8ed1b