Feb 24, 2025 · Feb 21, 2025 · Feb 24, 2025 · Feb 24, 2025 · Feb 21, 2025 · Feb 21, 2025
diff --git a/Coder Desktop/VPN/PacketTunnelProvider.swift b/Coder Desktop/VPN/PacketTunnelProvider.swift
        options _: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void
    ) {
        logger.info("startTunnel called")
        guard manager == nil else {
            logger.error("startTunnel called with non-nil Manager")
            // If the tunnel is already running, then we can just mark as connected.
            completionHandler(nil)
            return
        }
        start(completionHandler)
    }

    // called by `startTunnel` and on `wake`
    func start(_ completionHandler: @escaping (Error?) -> Void) {
        guard manager == nil else {
            logger.error("startTunnel called with non-nil Manager")
            completionHandler(makeNSError(suffix: "PTP", desc: "Already running"))
            return
        }
        guard let proto = protocolConfiguration as? NETunnelProviderProtocol,
              let baseAccessURL = proto.serverAddress
        else {
                logger.error("error stopping manager: \(error.description, privacy: .public)")
            }
            globalXPCListenerDelegate.vpnXPCInterface.manager = nil
            // Mark teardown as complete by setting manager to nil, and
            // calling the completion handler.
            self.manager = nil
            completionHandler()
        }
        self.manager = nil
    }

    override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)?) {
    }

    override func wake() {
        // It's possible the tunnel is still starting up, if it is, wake should
        // be a no-op.
        guard !reasserting else { return }
        guard manager == nil else {
            logger.error("wake called with non-nil Manager")
            return
        }
        logger.debug("wake called")
        reasserting = true
        currentSettings = .init(tunnelRemoteAddress: "127.0.0.1")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,16 +48,17 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
		options _: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void
		) {
		logger.info("startTunnel called")
		guard manager == nil else {
		logger.error("startTunnel called with non-nil Manager")
		// If the tunnel is already running, then we can just mark as connected.
		completionHandler(nil)
ethanndickson marked this conversation as resolved. Show resolvedHide resolved
		return
		}
		start(completionHandler)
		}

		// called by `startTunnel` and on `wake`
		func start(_ completionHandler: @escaping (Error?) -> Void) {
		guard manager == nil else {
		logger.error("startTunnel called with non-nil Manager")
		completionHandler(makeNSError(suffix: "PTP", desc: "Already running"))
		return
		}
		guard let proto = protocolConfiguration as? NETunnelProviderProtocol,
		let baseAccessURL = proto.serverAddress
		else {
Expand DownExpand Up		@@ -123,9 +124,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
		logger.error("error stopping manager: \(error.description, privacy: .public)")
		}
		globalXPCListenerDelegate.vpnXPCInterface.manager = nil
		// Mark teardown as complete by setting manager to nil, and
		// calling the completion handler.
		self.manager = nil
		completionHandler()
		}
		self.manager = nil
		}

		override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)?) {
Expand All		@@ -142,6 +145,13 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
		}

		override func wake() {
		// It's possible the tunnel is still starting up, if it is, wake should
		// be a no-op.
		guard !reasserting else { return }
Copy link MemberAuthor ethanndicksonFeb 21, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. macOS does indeed`wake` a bunch during sleep to check the network. For us dogfooding, this means it might attempt to download a new dylib while the device sleeps, which the user won't be able to approve. In that case it'll get stuck in`reasserting`, in this case (and in any case, really) we don't want to try and start it up a second time. Copy link Member ThomasK33Feb 21, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Got it. Would you also mind adding that as a code comment? ethanndickson reacted with thumbs up emoji
		guard manager == nil else {
		logger.error("wake called with non-nil Manager")
		return
		}
Comment on lines +151 to +154 Copy link MemberAuthor ethanndicksonFeb 21, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This was previously in the`start` function called right after, but we should avoid resetting the network settings needlessly if we can. ethanndickson reacted with thumbs up emoji
		logger.debug("wake called")
		reasserting = true
		currentSettings = .init(tunnelRemoteAddress: "127.0.0.1")
Expand Down