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

Clean up do_read. 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts 2018-08-05 15:58:52 +02:00
parent a1a5e73a5d
commit b6d8219244
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
WireGuardNetworkExtension/WireGuardGoWrapper.m
View File

@ -81,6 +81,8 @@ 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)
{ {
WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx; WireGuardGoWrapper *wrapper = (__bridge WireGuardGoWrapper *)ctx;
if (wrapper.isClosed) return -1;
if (wrapper.packets.count == 0) { if (wrapper.packets.count == 0) {
[wrapper.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) { [wrapper.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) {
@ -97,11 +99,14 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
[wrapper.packets removeObjectAtIndex:0]; [wrapper.packets removeObjectAtIndex:0];
[wrapper.protocols removeObjectAtIndex:0]; [wrapper.protocols removeObjectAtIndex:0];
len = [packet length]; NSUInteger packetLength = [packet length];
buf = (Byte*)malloc(len); if (packetLength > len) {
memcpy(buf, [packet bytes], len); // The packet will be dropped when we end up here.
return 0;
}
memcpy(buf, [packet bytes], packetLength);
return wrapper.isClosed ? -1 : 0; 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)