passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Universal logging. 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts 2018-08-12 21:40:44 +02:00
parent a27328ed72
commit f6fc8cd9bd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WireGuardNetworkExtension/WireGuardGoWrapper.m
View File

@ -84,6 +84,7 @@ 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);
WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx; WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx;
if (wrapper.isClosed) return -1; if (wrapper.isClosed) return -1;
@ -99,9 +100,11 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
[wrapper.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) { [wrapper.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) {
[wrapper.packets addObjectsFromArray:packets]; [wrapper.packets addObjectsFromArray:packets];
[wrapper.protocols addObjectsFromArray:protocols]; [wrapper.protocols addObjectsFromArray:protocols];
os_log_debug([WireGuardGoWrapper log], "do_read - signal - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
[wrapper.condition signal]; [wrapper.condition signal];
}]; }];
}); });
os_log_debug([WireGuardGoWrapper log], "do_read - wait - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
[wrapper.condition wait]; [wrapper.condition wait];
} }
@ -113,15 +116,18 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
NSUInteger packetLength = [packet length]; NSUInteger packetLength = [packet length];
if (packetLength > len) { if (packetLength > len) {
// The packet will be dropped when we end up here. // The packet will be dropped when we end up here.
os_log_debug([WireGuardGoWrapper log], "do_read - drop - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
return 0; return 0;
} }
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);
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)
{ {
os_log_debug([WireGuardGoWrapper log], "do_write - start");
WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx; WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx;
//TODO: determine IPv4 or IPv6 status. //TODO: determine IPv4 or IPv6 status.
NSData *packet = [[NSData alloc] initWithBytes:buf length:len]; NSData *packet = [[NSData alloc] initWithBytes:buf length:len];