ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add autorelease pool markers in Go callback functions.

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts
2018-08-23 09:17:04 +02:00
parent fc1ddc8b12
commit 8c8030e5c7
1 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuardNetworkExtension/WireGuardGoWrapper.m
+8 -2
View File
@@ -114,12 +114,13 @@ static void do_log(int level, const char *tag, const char *msg);
static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len) static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
{ {
// os_log_debug([WireGuardGoWrapper log], "do_read - start - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread); @autoreleasepool {
os_log_debug([WireGuardGoWrapper log], "do_read - start - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx; WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx;
if (wrapper.isClosed) return -1; if (wrapper.isClosed) return -1;
if (wrapper.handle < 0 || !wrapper.configured ) { if (wrapper.handle < 0 || !wrapper.configured ) {
// os_log_debug([WireGuardGoWrapper log], "do_read - early - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread); os_log_debug([WireGuardGoWrapper log], "do_read - early - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
return 0; return 0;
} }
@@ -161,10 +162,12 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
memcpy(buf, [packet bytes], packetLength); memcpy(buf, [packet bytes], packetLength);
os_log_debug([WireGuardGoWrapper log], "do_read - packet - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread); os_log_debug([WireGuardGoWrapper log], "do_read - packet - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
return packetLength; return packetLength;
}
} }
static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len) static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len)
{ {
@autoreleasepool {
os_log_debug([WireGuardGoWrapper log], "do_write - start"); os_log_debug([WireGuardGoWrapper log], "do_write - start");
WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx; WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx;
@@ -172,10 +175,13 @@ static ssize_t do_write(const void *ctx, const unsigned char *buf, size_t len)
NSData *packet = [[NSData alloc] initWithBytes:buf length:len]; NSData *packet = [[NSData alloc] initWithBytes:buf length:len];
[wrapper.packetFlow writePackets:@[packet] withProtocols:@[@AF_INET]]; [wrapper.packetFlow writePackets:@[packet] withProtocols:@[@AF_INET]];
return len; return len;
}
} }
static void do_log(int level, const char *tag, const char *msg) static void do_log(int level, const char *tag, const char *msg)
{ {
@autoreleasepool {
// TODO Get some details on the log level and distribute to matching log levels. // TODO Get some details on the log level and distribute to matching log levels.
os_log([WireGuardGoWrapper log], "Log level %d for %{public}s: %{public}s", level, tag, msg); os_log([WireGuardGoWrapper log], "Log level %d for %{public}s: %{public}s", level, tag, msg);
}
} }