Reset temporary changes.

Sources/NetworkProtection/PacketTunnelProvider.swift

@@ -637,6 +637,10 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         let startupOptions = StartupOptions(options: options ?? [:])
         os_log("Starting tunnel with options: %{public}s", log: .networkProtection, startupOptions.description)
 
+        // Reset snooze if the VPN is restarting.
+        // TODO: Only reset if the user initiated the startup - if the VPN crashed and was restarted by Connect on Demand, then restore snooze mode.
+        self.snoozeTimingStore.reset()
+
         do {
             try load(options: startupOptions)
             try loadVendorOptions(from: tunnelProviderProtocol)

Sources/NetworkProtection/Status/ConnectionErrorObserver/ConnectionErrorObserverThroughSession.swift

@@ -88,7 +88,9 @@ public class ConnectionErrorObserverThroughSession: ConnectionErrorObserver {
 
     private func handleStatusChangeNotification(_ notification: Notification) {
         do {
-            guard let session = ConnectionSessionUtilities.session(from: notification) else {
+            guard let session = ConnectionSessionUtilities.session(from: notification),
+                session.status == .disconnected else {
+
                 return
             }
 

Sources/NetworkProtection/Status/ConnectionServerInfoObserver/ConnectionServerInfoObserverThroughSession.swift

@@ -98,6 +98,10 @@ public class ConnectionServerInfoObserverThroughSession: ConnectionServerInfoObs
     // MARK: - Obtaining the NetP VPN status
 
     private func updateServerInfo(session: NETunnelProviderSession) async {
+        guard session.status == .connected else {
+            return
+        }
+
         let serverAddress = await self.serverAddress(from: session)
         let serverLocation = await self.serverLocation(from: session)