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 --- wireguard-go-bridge/src/api-ios.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'wireguard-go-bridge/src') 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]))) } } } -- cgit v1.2.3-59-g8ed1b