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

Keep tabs on memory usage 

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-09-25 02:35:01 +02:00
parent 83def0a52b
commit 412a5ed445
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WireGuardNetworkExtension/PacketTunnelProvider.swift
View File

@ -136,6 +136,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
return withStringsAsGoStrings(interfaceName, settings) { (nameGoStr, settingsGoStr) -> Int32 in return withStringsAsGoStrings(interfaceName, settings) { (nameGoStr, settingsGoStr) -> Int32 in
return withUnsafeMutablePointer(to: &wgContext) { (wgCtxPtr) -> Int32 in return withUnsafeMutablePointer(to: &wgContext) { (wgCtxPtr) -> Int32 in
return wgTurnOn(nameGoStr, settingsGoStr, { (wgCtxPtr, buf, len) -> Int in return wgTurnOn(nameGoStr, settingsGoStr, { (wgCtxPtr, buf, len) -> Int in
autoreleasepool {
// read_fn: Read from the TUN interface and pass it on to WireGuard // read_fn: Read from the TUN interface and pass it on to WireGuard
guard let wgCtxPtr = wgCtxPtr else { return 0 } guard let wgCtxPtr = wgCtxPtr else { return 0 }
guard let buf = buf else { return 0 } guard let buf = buf else { return 0 }
@ -149,7 +150,9 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
return packetData.count return packetData.count
} }
return 0 return 0
}
}, { (wgCtxPtr, buf, len) -> Int in }, { (wgCtxPtr, buf, len) -> Int in
autoreleasepool {
// write_fn: Receive packets from WireGuard and write to the TUN interface // write_fn: Receive packets from WireGuard and write to the TUN interface
guard let wgCtxPtr = wgCtxPtr else { return 0 } guard let wgCtxPtr = wgCtxPtr else { return 0 }
guard let buf = buf else { return 0 } guard let buf = buf else { return 0 }
@ -170,6 +173,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
return len return len
} }
return 0 return 0
}
}, },
wgCtxPtr) wgCtxPtr)
} }
@ -203,18 +207,16 @@ class WireGuardContext {
if outboundPackets.isEmpty { if outboundPackets.isEmpty {
readPacketCondition.lock() readPacketCondition.lock()
packetFlow.readPacketObjects(completionHandler: packetsRead) packetFlow.readPacketObjects(completionHandler: packetsRead)
// Wait till the completion handler of packetFlow.readPacketObjects() finishes
while outboundPackets.isEmpty && !self.isTunnelClosed { while outboundPackets.isEmpty && !self.isTunnelClosed {
readPacketCondition.wait() readPacketCondition.wait()
} }
readPacketCondition.unlock() readPacketCondition.unlock()
} }
isTunnelClosed = self.isTunnelClosed isTunnelClosed = self.isTunnelClosed
if outboundPackets.isEmpty { if !outboundPackets.isEmpty {
return nil
} else {
return outboundPackets.removeFirst() return outboundPackets.removeFirst()
} }
return nil
} }
func writePacket(packet: NEPacket, isTunnelClosed: inout Bool) -> Bool { func writePacket(packet: NEPacket, isTunnelClosed: inout Bool) -> Bool {

2
wireguard-go

@ -1 +1 @@
Subproject commit ebc7541953269b39cd73d703166b9b8ee7b34e37 Subproject commit 70bcf9ecb801dadd82c68143209ca2707aa63d2b

2
wireguard-go-bridge/Makefile
View File

@ -2,7 +2,7 @@
# #
# Copyright (C) 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. # Copyright (C) 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
FILES := $(filter-out %/main.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go))
ARCHES := arm64 armv7 x86_64 ARCHES := arm64 armv7 x86_64
GOARCH_arm64 := arm64 GOARCH_arm64 := arm64

1
wireguard-go-bridge/src/git.zx2c4.com/wireguard-go/api-ios.go
View File

@ -52,7 +52,6 @@ var tunnelHandles map[int32]*Device
func init() { func init() {
versionString = C.CString(WireGuardGoVersion) versionString = C.CString(WireGuardGoVersion)
preallocatedBuffers = 64
roamingDisabled = true roamingDisabled = true
tunnelHandles = make(map[int32]*Device) tunnelHandles = make(map[int32]*Device)
signals := make(chan os.Signal) signals := make(chan os.Signal)

16
wireguard-go-bridge/src/git.zx2c4.com/wireguard-go/queueconstants.go Normal file
View File

@ -0,0 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0
*
* Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved.
*/
package main
/* Fit within memory limits for iOS */
const (
QueueOutboundSize = 1024
QueueInboundSize = 1024
QueueHandshakeSize = 1024
MaxSegmentSize = 1700
PreallocatedBuffersPerPool = 1024
)