From 2a9c7e47451fbc4e4bba827f069fa410ef178136 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 31 Oct 2018 03:13:00 +0100 Subject: wireguard-go-bridge: simplify logging and remove tags Signed-off-by: Jason A. Donenfeld --- .../WireGuardNetworkExtension/PacketTunnelProvider.swift | 5 ++--- wireguard-go-bridge/example.c | 4 ++-- wireguard-go-bridge/src/api-ios.go | 14 +++++--------- wireguard-go-bridge/wireguard.h | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift index 5f19fb1..766840d 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -133,7 +133,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider { } private func configureLogger() { - wgSetLogger { (level, tagCStr, msgCStr) in + wgSetLogger { (level, msgCStr) in let logType: OSLogType switch level { case 0: @@ -145,9 +145,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider { default: logType = .default } - let tag = (tagCStr != nil) ? String(cString: tagCStr!) : "" let msg = (msgCStr != nil) ? String(cString: msgCStr!) : "" - os_log("wg log: %{public}s: %{public}s", log: OSLog.default, type: logType, tag, msg) + os_log("%{public}s", log: OSLog.default, type: logType, msg) } } diff --git a/wireguard-go-bridge/example.c b/wireguard-go-bridge/example.c index 33ed1f0..7ba0c42 100644 --- a/wireguard-go-bridge/example.c +++ b/wireguard-go-bridge/example.c @@ -27,9 +27,9 @@ ssize_t do_write(void *ctx, unsigned char *buf, size_t len) return len; } -void do_log(int level, const char *tag, const char *msg) +void do_log(int level, const char *msg) { - printf("Log level %d for %s: %s", level, tag, msg); + printf("Log level %d: %s", level, msg); } int main(int argc, char *argv[]) diff --git a/wireguard-go-bridge/src/api-ios.go b/wireguard-go-bridge/src/api-ios.go index 7bb648e..07dd45a 100644 --- a/wireguard-go-bridge/src/api-ios.go +++ b/wireguard-go-bridge/src/api-ios.go @@ -7,9 +7,9 @@ package main // #include // #include -// static void callLogger(void *func, int level, const char *tag, const char *msg) +// static void callLogger(void *func, int level, const char *msg) // { -// ((void(*)(int, const char *, const char *))func)(level, tag, msg); +// ((void(*)(int, const char *))func)(level, msg); // } import "C" @@ -40,10 +40,8 @@ func (l *CLogger) Write(p []byte) (int, error) { if uintptr(loggerFunc) == 0 { return 0, errors.New("No logger initialized") } - tag := C.CString("WireGuard/GoBackend/"+l.interfaceName) - message := C.CString(string(p)) - C.callLogger(loggerFunc, l.level, tag, message) - C.free(unsafe.Pointer(tag)) + message := C.CString(l.interfaceName + ": " + string(p)) + C.callLogger(loggerFunc, l.level, message) C.free(unsafe.Pointer(message)) return len(p), nil } @@ -64,9 +62,7 @@ func init() { n := runtime.Stack(buf, true) buf[n] = 0 if uintptr(loggerFunc) != 0 { - tag := C.CString("WireGuard/GoBackend/Stacktrace") - C.callLogger(loggerFunc, 0, tag, (*_Ctype_char)(unsafe.Pointer(&buf[0]))) - C.free(unsafe.Pointer(tag)) + C.callLogger(loggerFunc, 0, (*_Ctype_char)(unsafe.Pointer(&buf[0]))) } } } diff --git a/wireguard-go-bridge/wireguard.h b/wireguard-go-bridge/wireguard.h index a0950bf..8517bce 100644 --- a/wireguard-go-bridge/wireguard.h +++ b/wireguard-go-bridge/wireguard.h @@ -11,7 +11,7 @@ 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 *tag, const char *msg); +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 void wgTurnOff(int handle); -- cgit v1.2.3-59-g8ed1b