X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fmain.go;h=8a1f2a4864aaf4d5e84e80a6bf315fbc6d39f6be;hb=70e70dfded87dc2d737160444829c58ed8ed2fa0;hp=2beb396f6958409a2cf0f27f9e938e6a76558d47;hpb=f47fff1e42f75b736e7067ec06c2e81394833d46;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index 2beb396..8a1f2a4 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2018 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@ func main() {
 	log.Println(govpn.VersionGet())
 
 	confInit()
-	knownPeers = govpn.KnownPeers(make(map[string]**govpn.Peer))
 
 	if *egdPath != "" {
 		log.Println("Using", *egdPath, "EGD")
@@ -106,36 +105,45 @@ MainCycle:
 		select {
 		case <-termSignal:
 			govpn.BothPrintf(`[terminating bind="%s"]`, *bindAddr)
-			for _, ps := range peers {
+			peers.Range(func(_, psI interface{}) bool {
+				ps := psI.(*PeerState)
 				govpn.ScriptCall(
 					confs[*ps.peer.ID].Down,
 					ps.tap.Name,
 					ps.peer.Addr,
 				)
-			}
+				return true
+			})
 			break MainCycle
 		case <-hsHeartbeat:
 			now := time.Now()
-			hsLock.Lock()
-			for addr, hs := range handshakes {
+
+			handshakes.Range(func(addrI, hsI interface{}) bool {
+				addr := addrI.(string)
+				hs := hsI.(*govpn.Handshake)
 				if hs.LastPing.Add(timeout).Before(now) {
 					govpn.Printf(`[handshake-delete bind="%s" addr="%s"]`, *bindAddr, addr)
 					hs.Zero()
-					delete(handshakes, addr)
+					handshakes.Delete(addr)
 				}
-			}
-			peersLock.Lock()
-			peersByIDLock.Lock()
-			kpLock.Lock()
-			for addr, ps := range peers {
+				return true
+			})
+
+			peers.Range(func(addrI, psI interface{}) bool {
+				addr := addrI.(string)
+				ps := psI.(*PeerState)
 				ps.peer.BusyR.Lock()
 				needsDeletion = ps.peer.LastPing.Add(timeout).Before(now)
 				ps.peer.BusyR.Unlock()
 				if needsDeletion {
-					govpn.Printf(`[peer-delete bind="%s" peer="%s"]`, *bindAddr, ps.peer)
-					delete(peers, addr)
-					delete(knownPeers, addr)
-					delete(peersByID, *ps.peer.ID)
+					govpn.Printf(
+						`[peer-delete bind="%s" peer="%s"]`,
+						*bindAddr,
+						ps.peer.ID.String(),
+					)
+					peers.Delete(addr)
+					knownPeers.Delete(addr)
+					peersByID.Delete(*ps.peer.ID)
 					go govpn.ScriptCall(
 						confs[*ps.peer.ID].Down,
 						ps.tap.Name,
@@ -143,11 +151,8 @@ MainCycle:
 					)
 					ps.terminator <- struct{}{}
 				}
-			}
-			hsLock.Unlock()
-			peersLock.Unlock()
-			peersByIDLock.Unlock()
-			kpLock.Unlock()
+				return true
+			})
 		}
 	}
 }