@@ -48,16 +48,17 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
4848 options _: [ String : NSObject ] ? , completionHandler: @escaping ( Error ? ) -> Void
4949) {
5050 logger. info ( " startTunnel called " )
51+ guard manager== nil else {
52+ logger. error ( " startTunnel called with non-nil Manager " )
53+ // If the tunnel is already running, then we can just mark as connected.
54+ completionHandler ( nil )
55+ return
56+ }
5157start ( completionHandler)
5258}
5359
5460 // called by `startTunnel` and on `wake`
5561func start( _ completionHandler: @escaping ( Error ? ) -> Void ) {
56- guard manager== nil else {
57- logger. error ( " startTunnel called with non-nil Manager " )
58- completionHandler ( makeNSError ( suffix: " PTP " , desc: " Already running " ) )
59- return
60- }
6162guard let proto= protocolConfigurationas? NETunnelProviderProtocol ,
6263let baseAccessURL= proto. serverAddress
6364else {
@@ -123,9 +124,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
123124 logger. error ( " error stopping manager: \( error. description, privacy: . public) " )
124125}
125126 globalXPCListenerDelegate. vpnXPCInterface. manager= nil
127+ // Mark teardown as complete by setting manager to nil, and
128+ // calling the completion handler.
129+ self . manager= nil
126130completionHandler ( )
127131}
128- self . manager= nil
129132}
130133
131134override func handleAppMessage( _ messageData: Data , completionHandler: ( ( Data ? ) -> Void ) ? ) {
@@ -142,6 +145,13 @@ class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable {
142145}
143146
144147override func wake( ) {
148+ // It's possible the tunnel is still starting up, if it is, wake should
149+ // be a no-op.
150+ guard !reassertingelse { return }
151+ guard manager== nil else {
152+ logger. error ( " wake called with non-nil Manager " )
153+ return
154+ }
145155 logger. debug ( " wake called " )
146156 reasserting= true
147157 currentSettings= . init( tunnelRemoteAddress: " 127.0.0.1 " )