X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-server%2Fmain.go;h=2beb396f6958409a2cf0f27f9e938e6a76558d47;hp=639e37c5693c2b8621ac87f04b019cd44d12ffa6;hb=f47fff1e42f75b736e7067ec06c2e81394833d46;hpb=588499ac2eedea258c304fca647509c7b587d7e8 diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-server/main.go index 639e37c..2beb396 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,7 +125,7 @@ MainCycle: } } peersLock.Lock() - peersByIdLock.Lock() + peersByIDLock.Lock() kpLock.Lock() for addr, ps := range peers { ps.peer.BusyR.Lock() @@ -135,9 +135,9 @@ MainCycle: govpn.Printf(`[peer-delete bind="%s" peer="%s"]`, *bindAddr, ps.peer) 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 +146,7 @@ MainCycle: } hsLock.Unlock() peersLock.Unlock() - peersByIdLock.Unlock() + peersByIDLock.Unlock() kpLock.Unlock() } }