diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-12-25 22:38:32 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-12-26 01:17:55 +0100 |
commit | c9c343cde21eab0b776c97e7017e7fd515b4ac4d (patch) | |
tree | 3e2efb04d430b2ee3d4407b33ef50b3327356c60 /WireGuard | |
parent | minizip: Remove zip encryption code (diff) | |
download | wireguard-apple-c9c343cde21eab0b776c97e7017e7fd515b4ac4d.tar.xz wireguard-apple-c9c343cde21eab0b776c97e7017e7fd515b4ac4d.zip |
NetworkExtension: rescope socket instead of tearing down socket
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'WireGuard')
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift | 29 | ||||
-rw-r--r-- | WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift | 8 |
2 files changed, 16 insertions, 21 deletions
diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift index 6b30058..67b1f4d 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -10,7 +10,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider { private var handle: Int32? private var networkMonitor: NWPathMonitor? - private var lastFirstInterface: NWInterface? + private var ifname: String? private var packetTunnelSettingsGenerator: PacketTunnelSettingsGenerator? deinit { @@ -49,7 +49,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider { startTunnelCompletionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings) } else { self.networkMonitor = NWPathMonitor() - self.lastFirstInterface = self.networkMonitor!.currentPath.availableInterfaces.first self.networkMonitor!.pathUpdateHandler = self.pathUpdate self.networkMonitor!.start(queue: DispatchQueue(label: "NetworkMonitor")) @@ -60,6 +59,13 @@ class PacketTunnelProvider: NEPacketTunnelProvider { startTunnelCompletionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor) return } + var ifnameSize = socklen_t(IFNAMSIZ) + let ifnamePtr = UnsafeMutablePointer<CChar>.allocate(capacity: Int(ifnameSize)) + ifnamePtr.initialize(repeating: 0, count: Int(ifnameSize)) + if getsockopt(fileDescriptor, 2 /* SYSPROTO_CONTROL */, 2 /* UTUN_OPT_IFNAME */, ifnamePtr, &ifnameSize) == 0 { + self.ifname = String(cString: ifnamePtr) + } + wg_log(.info, message: "Tunnel interface is \(self.ifname ?? "unknown")") let handle = self.packetTunnelSettingsGenerator!.uapiConfiguration().withGoString { return wgTurnOn($0, fileDescriptor) } if handle < 0 { wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(handle)") @@ -107,19 +113,14 @@ class PacketTunnelProvider: NEPacketTunnelProvider { private func pathUpdate(path: Network.NWPath) { guard let handle = handle, let packetTunnelSettingsGenerator = packetTunnelSettingsGenerator else { return } - var listenPort: UInt16? - //TODO(zx2c4): Remove the `true` here after extensive testing with network/cell simulations. - if true || path.availableInterfaces.isEmpty || lastFirstInterface != path.availableInterfaces.first { - listenPort = wgGetListenPort(handle) - lastFirstInterface = path.availableInterfaces.first + wg_log(.debug, message: "Network change detected with \(path.status) route and interface order \(path.availableInterfaces)") + _ = packetTunnelSettingsGenerator.endpointUapiConfiguration().withGoString { return wgSetConfig(handle, $0) } + var interfaces = path.availableInterfaces + if let ifname = ifname { + interfaces = interfaces.filter { $0.name != ifname } } - guard path.status == .satisfied else { return } - wg_log(.debug, message: "Network change detected, re-establishing sockets and IPs: \(path.availableInterfaces)") - let endpointString = packetTunnelSettingsGenerator.endpointUapiConfiguration(currentListenPort: listenPort) - let err = endpointString.withGoString { return wgSetConfig(handle, $0) } - if err == -EADDRINUSE && listenPort != nil { - let endpointString = packetTunnelSettingsGenerator.endpointUapiConfiguration(currentListenPort: 0) - _ = endpointString.withGoString { return wgSetConfig(handle, $0) } + if let ifscope = interfaces.first?.index { + wgBindInterfaceScope(handle, Int32(ifscope)) } } } diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift index 462d110..5946843 100644 --- a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift +++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift @@ -14,13 +14,8 @@ class PacketTunnelSettingsGenerator { self.resolvedEndpoints = resolvedEndpoints } - func endpointUapiConfiguration(currentListenPort: UInt16?) -> String { + func endpointUapiConfiguration() -> String { var wgSettings = "" - - if let currentListenPort = currentListenPort { - wgSettings.append("listen_port=\(tunnelConfiguration.interface.listenPort ?? currentListenPort)\n") - } - for (index, peer) in tunnelConfiguration.peers.enumerated() { wgSettings.append("public_key=\(peer.publicKey.hexEncodedString())\n") if let endpoint = resolvedEndpoints[index] { @@ -28,7 +23,6 @@ class PacketTunnelSettingsGenerator { wgSettings.append("endpoint=\(endpoint.stringRepresentation)\n") } } - return wgSettings } |