Merge branch 'develop'

[govpn.git] / src / cypherpunks.ru / govpn / cmd / govpn-server / common.go

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
index f18d34b420c964a644dcbc4ae76170c1672e8800..e0e8e033da043f42a000a219f3559d1f0fbda613 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
@@ -32,17 +32,10 @@ type PeerState struct {
 }
 
 var (
-       handshakes map[string]*govpn.Handshake = make(map[string]*govpn.Handshake)
-       hsLock     sync.RWMutex
-
-       peers     = make(map[string]*PeerState)
-       peersLock sync.RWMutex
-
-       peersByID     = make(map[govpn.PeerID]string)
-       peersByIDLock sync.RWMutex
-
-       knownPeers govpn.KnownPeers
-       kpLock     sync.RWMutex
+       handshakes sync.Map
+       peers      sync.Map
+       peersByID  sync.Map
+       knownPeers sync.Map
 )
 
 func callUp(peerID *govpn.PeerID, remoteAddr string) (string, error) {