static func makeReference(containing value: String, called name: String, previouslyReferencedBy oldRef: Data? = nil) -> Data? {
var ret: OSStatus
- guard var id = Bundle.main.bundleIdentifier else {
+ guard var bundleIdentifier = Bundle.main.bundleIdentifier else {
wg_log(.error, staticMessage: "Unable to determine bundle identifier")
return nil
}
- if id.hasSuffix(".network-extension") {
- id.removeLast(".network-extension".count)
+ if bundleIdentifier.hasSuffix(".network-extension") {
+ bundleIdentifier.removeLast(".network-extension".count)
}
var items: [String: Any] = [kSecClass as String: kSecClassGenericPassword,
kSecAttrLabel as String: "WireGuard Tunnel: " + name,
kSecAttrAccount as String: name + ": " + UUID().uuidString,
kSecAttrDescription as String: "wg-quick(8) config",
- kSecAttrService as String: id,
+ kSecAttrService as String: bundleIdentifier,
kSecValueData as String: value.data(using: .utf8) as Any,
kSecReturnPersistentRef as String: true]
}
}
- static func tunnelNameIsLessThan(_ a: String, _ b: String) -> Bool {
- return a.compare(b, options: [.caseInsensitive, .diacriticInsensitive, .widthInsensitive, .numeric]) == .orderedAscending
+ static func tunnelNameIsLessThan(_ lhs: String, _ rhs: String) -> Bool {
+ return lhs.compare(rhs, options: [.caseInsensitive, .diacriticInsensitive, .widthInsensitive, .numeric]) == .orderedAscending
}
}
}
func reinstateTunnelsDeletedOutsideApp() {
- let rd = reinstationDataForTunnelsDeletedOutsideApp()
- reinstateTunnels(ArraySlice(rd), completionHandler: nil)
+ let data = reinstationDataForTunnelsDeletedOutsideApp()
+ reinstateTunnels(ArraySlice(data), completionHandler: nil)
}
private func reinstateTunnels(_ rdArray: ArraySlice<ReinstationData>, completionHandler: (() -> Void)?) {
}
}!
let firstPeerSectionIndex = interfaceSectionIndex + 1
- var interfaceFieldIsVisible = self.interfaceFieldIsVisible
- var peerFieldIsVisible = self.peerFieldIsVisible
+ let interfaceFieldIsVisible = self.interfaceFieldIsVisible
+ let peerFieldIsVisible = self.peerFieldIsVisible
func handleSectionFieldsModified<T>(fields: [T], fieldIsVisible: [Bool], section: Int, changes: [T: TunnelViewModel.Changes.FieldChange]) {
for (index, field) in fields.enumerated() {
}
extension UISplitViewController {
- func showDetailViewController(_ vc: UIViewController, sender: Any?, animated: Bool) {
+ func showDetailViewController(_ viewController: UIViewController, sender: Any?, animated: Bool) {
if animated {
- showDetailViewController(vc, sender: sender)
+ showDetailViewController(viewController, sender: sender)
} else {
UIView.performWithoutAnimation {
- showDetailViewController(vc, sender: sender)
+ showDetailViewController(viewController, sender: sender)
}
}
}
static func unarchive(url: URL, requiredFileExtensions: [String]) throws -> [(fileBaseName: String, contents: Data)] {
var results = [(fileBaseName: String, contents: Data)]()
- var requiredFileExtensionsLowercased = requiredFileExtensions.map { $0.lowercased() }
+ let requiredFileExtensionsLowercased = requiredFileExtensions.map { $0.lowercased() }
guard let zipFile = unzOpen64(url.path) else {
throw ZipArchiveError.cantOpenInputZipFile
guard unzOpenCurrentFile(zipFile) == UNZ_OK else { throw ZipArchiveError.badArchive }
let bufferSize = 16384 // 16 KiB
- var fileNameBuffer = UnsafeMutablePointer<Int8>.allocate(capacity: bufferSize)
- var dataBuffer = UnsafeMutablePointer<Int8>.allocate(capacity: bufferSize)
+ let fileNameBuffer = UnsafeMutablePointer<Int8>.allocate(capacity: bufferSize)
+ let dataBuffer = UnsafeMutablePointer<Int8>.allocate(capacity: bufferSize)
defer {
fileNameBuffer.deallocate()
let execute = queue?.sync ?? { $0() }
execute {
- DispatchQueue.concurrentPerform(iterations: self.count) { (index) in
+ DispatchQueue.concurrentPerform(iterations: self.count) { index in
let value = transform(self[index])
resultQueue.sync {
result[index] = value
private static let resolverQueue = DispatchQueue(label: "DNSResolverQueue", qos: .default, attributes: .concurrent)
static func resolveSync(endpoints: [Endpoint?]) -> [Result<Endpoint, DNSResolutionError>?] {
- let isAllEndpointsAlreadyResolved = endpoints.allSatisfy({ (maybeEndpoint) -> Bool in
+ let isAllEndpointsAlreadyResolved = endpoints.allSatisfy { maybeEndpoint -> Bool in
return maybeEndpoint?.hasHostAsIPAddress() ?? true
- })
+ }
if isAllEndpointsAlreadyResolved {
- return endpoints.map { (endpoint) in
+ return endpoints.map { endpoint in
return endpoint.map { .success($0) }
}
}
- return endpoints.concurrentMap(queue: resolverQueue) {
- (endpoint) -> Result<Endpoint, DNSResolutionError>? in
+ return endpoints.concurrentMap(queue: resolverQueue) { endpoint -> Result<Endpoint, DNSResolutionError>? in
guard let endpoint = endpoint else { return nil }
if endpoint.hasHostAsIPAddress() {
return .success(endpoint)
} else {
return Result { try DNSResolver.resolveSync(endpoint: endpoint) }
- .mapError { $0 as! DNSResolutionError }
+ .mapError { error -> DNSResolutionError in
+ // swiftlint:disable:next force_cast
+ return error as! DNSResolutionError
+ }
}
}
}
init?(addrInfo: addrinfo) {
guard addrInfo.ai_family == AF_INET else { return nil }
- let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in.self, capacity: MemoryLayout<sockaddr_in>.size) { (ptr) -> Data in
+ let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in.self, capacity: MemoryLayout<sockaddr_in>.size) { ptr -> Data in
return Data(bytes: &ptr.pointee.sin_addr, count: MemoryLayout<in_addr>.size)
}
init?(addrInfo: addrinfo) {
guard addrInfo.ai_family == AF_INET6 else { return nil }
- let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in6.self, capacity: MemoryLayout<sockaddr_in6>.size) { (ptr) -> Data in
+ let addressData = addrInfo.ai_addr.withMemoryRebound(to: sockaddr_in6.self, capacity: MemoryLayout<sockaddr_in6>.size) { ptr -> Data in
return Data(bytes: &ptr.pointee.sin6_addr, count: MemoryLayout<in6_addr>.size)
}
import WireGuardKitC
/// The class describing a private key used by WireGuard.
-public class PrivateKey: _BaseKey {
+public class PrivateKey: BaseKey {
/// Derived public key
public var publicKey: PublicKey {
return rawValue.withUnsafeBytes { (privateKeyBufferPointer: UnsafeRawBufferPointer) -> PublicKey in
}
/// The class describing a public key used by WireGuard.
-public class PublicKey: _BaseKey {}
+public class PublicKey: BaseKey {}
/// The class describing a pre-shared key used by WireGuard.
-public class PreSharedKey: _BaseKey {}
+public class PreSharedKey: BaseKey {}
/// The base key implementation. Should not be used directly.
-public class _BaseKey: RawRepresentable, Equatable, Hashable {
+public class BaseKey: RawRepresentable, Equatable, Hashable {
/// Raw key representation
public let rawValue: Data
}
}
- public static func == (lhs: _BaseKey, rhs: _BaseKey) -> Bool {
+ public static func == (lhs: BaseKey, rhs: BaseKey) -> Bool {
return lhs.rawValue.withUnsafeBytes { (lhsBytes: UnsafeRawBufferPointer) -> Bool in
return rhs.rawValue.withUnsafeBytes { (rhsBytes: UnsafeRawBufferPointer) -> Bool in
return key_eq(
var buffer = [UInt8](repeating: 0, count: Int(IFNAMSIZ))
- return buffer.withUnsafeMutableBufferPointer { (mutableBufferPointer) in
+ return buffer.withUnsafeMutableBufferPointer { mutableBufferPointer in
guard let baseAddress = mutableBufferPointer.baseAddress else { return nil }
var ifnameSize = socklen_t(IFNAMSIZ)
networkMonitor.start(queue: self.workQueue)
self.networkMonitor = networkMonitor
- self.updateNetworkSettings(tunnelConfiguration: tunnelConfiguration) { (settingsGenerator, error) in
+ self.updateNetworkSettings(tunnelConfiguration: tunnelConfiguration) { settingsGenerator, error in
if let error = error {
completionHandler(error)
} else {
// This will broadcast the `NEVPNStatusDidChange` notification to the GUI process.
self.packetTunnelProvider?.reasserting = true
- self.updateNetworkSettings(tunnelConfiguration: tunnelConfiguration) { (settingsGenerator, error) in
+ self.updateNetworkSettings(tunnelConfiguration: tunnelConfiguration) { settingsGenerator, error in
if let error = error {
completionHandler(error)
} else {
/// Setup WireGuard log handler.
private func setupLogHandler() {
let context = Unmanaged.passUnretained(self).toOpaque()
- wgSetLogger(context) { (context, logLevel, message) in
+ wgSetLogger(context) { context, logLevel, message in
guard let context = context, let message = message else { return }
let unretainedSelf = Unmanaged<WireGuardAdapter>.fromOpaque(context)
let resolvedEndpoints: [Endpoint?]
let resolvePeersResult = Result { try self.resolvePeers(for: tunnelConfiguration) }
- .mapError { $0 as! WireGuardAdapterError }
+ .mapError { error -> WireGuardAdapterError in
+ // swiftlint:disable:next force_cast
+ return error as! WireGuardAdapterError
+ }
switch resolvePeersResult {
case .success(let endpoints):
condition.lock()
defer { condition.unlock() }
- self.packetTunnelProvider?.setTunnelNetworkSettings(networkSettings, completionHandler: { (error) in
+ self.packetTunnelProvider?.setTunnelNetworkSettings(networkSettings) { error in
systemError = error
condition.signal()
- })
+ }
// Packet tunnel's `setTunnelNetworkSettings` times out in certain
// scenarios & never calls the given callback.
private func resolvePeers(for tunnelConfiguration: TunnelConfiguration) throws -> [Endpoint?] {
let endpoints = tunnelConfiguration.peers.map { $0.endpoint }
let resolutionResults = DNSResolver.resolveSync(endpoints: endpoints)
- let resolutionErrors = resolutionResults.compactMap { (result) -> DNSResolutionError? in
+ let resolutionErrors = resolutionResults.compactMap { result -> DNSResolutionError? in
if case .failure(let error) = result {
return error
} else {
throw WireGuardAdapterError.dnsResolution(resolutionErrors)
}
- let resolvedEndpoints = resolutionResults.map { (result) -> Endpoint? in
+ let resolvedEndpoints = resolutionResults.map { result -> Endpoint? in
+ // swiftlint:disable:next force_try
return try! result?.get()
}
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://git.zx2c4.com/wireguard-apple";
requirement = {
- branch = master;
+ branch = "am/wg-adapter-rebased";
kind = branch;
};
};
"package": "WireGuardKit",
"repositoryURL": "https://git.zx2c4.com/wireguard-apple",
"state": {
- "branch": "master",
- "revision": "737f847c0db36429f7136fb514409c22e13a70ee",
+ "branch": "am/wg-adapter-rebased",
+ "revision": "e52f83b915a985a945dff622e5f48fa52e96f045",
"version": null
}
}
projects / thirdparty / wireguard-apple.git / commitdiff
