Explorar o código

fix panic in handleInvalidCertificate (#675)

* fix panic in handleInvalidCertificate

when HandleMonitorTick fires, the hostmap can be nil which causes a panic to occur when trying to clean up the hostmap in handleInvalidCertificate. This fix just stops the invalidation from continuing if the hostmap doesn't exist.

* removed conditional for disconnectInvalid in HandleDeletionTick
Don Stephan %!s(int64=3) %!d(string=hai) anos
pai
achega
332fa2b825
Modificáronse 1 ficheiros con 3 adicións e 6 borrados
  1. 3 6
      connection_manager.go

+ 3 - 6
connection_manager.go

@@ -230,12 +230,9 @@ func (n *connectionManager) HandleDeletionTick(now time.Time) {
 		hostinfo, err := n.hostMap.QueryVpnIp(vpnIp)
 		hostinfo, err := n.hostMap.QueryVpnIp(vpnIp)
 		if err != nil {
 		if err != nil {
 			n.l.Debugf("Not found in hostmap: %s", vpnIp)
 			n.l.Debugf("Not found in hostmap: %s", vpnIp)
-
-			if !n.intf.disconnectInvalid {
-				n.ClearIP(vpnIp)
-				n.ClearPendingDeletion(vpnIp)
-				continue
-			}
+			n.ClearIP(vpnIp)
+			n.ClearPendingDeletion(vpnIp)
+			continue
 		}
 		}
 
 
 		if n.handleInvalidCertificate(now, vpnIp, hostinfo) {
 		if n.handleInvalidCertificate(now, vpnIp, hostinfo) {