Split long line

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

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go
index 68a0172f40ca42b2df66fae78a2d414ac4cf45b9..3e80975587fbe6df3abd8572d9ae23d7ddea9aa1 100644 (file)
--- 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-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
@@ -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()
                }
        }