X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fclient%2Fclient.go;h=3014bdfab6adf0bf9276d6e31a7575286917791b;hb=c982ccb214ba8d0fd8a30dee7439ea2db1559f6f;hp=5a745c1d99c06fbe130916e032c47c40d6e6b696;hpb=05525a35e6d8bd08ea7684dbbf01f5d5636613ec;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/client/client.go b/src/cypherpunks.ru/govpn/client/client.go
index 5a745c1..3014bdf 100644
--- a/src/cypherpunks.ru/govpn/client/client.go
+++ b/src/cypherpunks.ru/govpn/client/client.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2017 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
@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"sync"
 	"time"
 
 	"github.com/agl/ed25519"
@@ -72,7 +73,7 @@ func (c *Configuration) isProxy() bool {
 type Client struct {
 	idsCache      *govpn.MACCache
 	tap           *govpn.TAP
-	knownPeers    govpn.KnownPeers
+	knownPeers    sync.Map
 	statsPort     net.Listener
 	timeouted     chan struct{}
 	rehandshaking chan struct{}
@@ -99,7 +100,6 @@ func (c *Client) MainCycle() {
 			c.Error <- fmt.Errorf("Can't listen on stats port: %s", err.Error())
 			return
 		}
-		c.knownPeers = govpn.KnownPeers(make(map[string]**govpn.Peer))
 		go govpn.StatsProcessor(c.statsPort, &c.knownPeers)
 	}
 
@@ -154,7 +154,7 @@ func NewClient(conf Configuration, verifier *govpn.Verifier, termSignal chan os.
 		termSignal:  termSignal,
 		Error:       make(chan error, 1),
 	}
-	confs := map[govpn.PeerId]*govpn.PeerConf{*verifier.Id: conf.Peer}
+	confs := map[govpn.PeerID]*govpn.PeerConf{*verifier.ID: conf.Peer}
 	client.idsCache.Update(&confs)
 	return &client
 }