X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fmain.go;h=3e80975587fbe6df3abd8572d9ae23d7ddea9aa1;hb=f926c8f7ea311927ecc7c86ac7fa3b804279e8a9;hp=639e37c5693c2b8621ac87f04b019cd44d12ffa6;hpb=572cac17bde738055312f7a468a0bde0e760a262;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 639e37c..3e80975 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
@@ -108,7 +108,7 @@ MainCycle:
 			govpn.BothPrintf(`[terminating bind="%s"]`, *bindAddr)
 			for _, ps := range peers {
 				govpn.ScriptCall(
-					confs[*ps.peer.Id].Down,
+					confs[*ps.peer.ID].Down,
 					ps.tap.Name,
 					ps.peer.Addr,
 				)
@@ -125,19 +125,23 @@ MainCycle:
 				}
 			}
 			peersLock.Lock()
-			peersByIdLock.Lock()
+			peersByIDLock.Lock()
 			kpLock.Lock()
 			for addr, ps := range peers {
 				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)
+					govpn.Printf(
+						`[peer-delete bind="%s" peer="%s"]`,
+						*bindAddr,
+						ps.peer.ID.String(),
+					)
 					delete(peers, addr)
 					delete(knownPeers, addr)
-					delete(peersById, *ps.peer.Id)
+					delete(peersByID, *ps.peer.ID)
 					go govpn.ScriptCall(
-						confs[*ps.peer.Id].Down,
+						confs[*ps.peer.ID].Down,
 						ps.tap.Name,
 						ps.peer.Addr,
 					)
@@ -146,7 +150,7 @@ MainCycle:
 			}
 			hsLock.Unlock()
 			peersLock.Unlock()
-			peersByIdLock.Unlock()
+			peersByIDLock.Unlock()
 			kpLock.Unlock()
 		}
 	}