Assume stale session if server sends HARD_RESET

When unsolicited.
passepartoutvpn · Jul 9, 2019 · 0f2234f · 0f2234f
1 parent 1dcf4d7
commit 0f2234f
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/TunnelKit/Sources/Protocols/OpenVPN/OpenVPNSession.swift b/TunnelKit/Sources/Protocols/OpenVPN/OpenVPNSession.swift
@@ -479,11 +479,20 @@ public class OpenVPNSession: Session {
 //                deferStop(.shutdown, e)
 //                return
             }
-            if (code == .hardResetServerV2) && (negotiationKey.controlState == .connected) {
-                deferStop(.shutdown, OpenVPNError.staleSession)
-                return
-            } else if (code == .softResetV1) && !negotiationKey.softReset {
-                softReset(isServerInitiated: true)
+            switch code {
+            case .hardResetServerV2:
+                guard negotiationKey.state == .hardReset else {
+                    deferStop(.shutdown, OpenVPNError.staleSession)
+                    return
+                }
+
+            case .softResetV1:
+                if !negotiationKey.softReset {
+                    softReset(isServerInitiated: true)
+                }
+
+            default:
+                break
             }
 
             sendAck(for: controlPacket)