Use convenient simpler Go 1.9's sync.Map

[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 770ec2256b76d33d38716b267a1c9dc68a818267..e0e8e033da043f42a000a219f3559d1f0fbda613 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-server/common.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-server/common.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
@@ -21,7 +21,6 @@ package main
 import (
        "bytes"
        "sync"
-       "time"
 
        "cypherpunks.ru/govpn"
 )
@@ -33,44 +32,23 @@ type PeerState struct {
 }
 
 var (
-       handshakes map[string]*govpn.Handshake = make(map[string]*govpn.Handshake)
-       hsLock     sync.RWMutex
-
-       peers     map[string]*PeerState = make(map[string]*PeerState)
-       peersLock sync.RWMutex
-
-       peersById     map[govpn.PeerId]string = 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 peerReady(ps PeerState) {
-       var data []byte
-       heartbeat := time.NewTicker(ps.peer.Timeout)
-Processor:
-       for {
-               select {
-               case <-heartbeat.C:
-                       ps.peer.EthProcess(nil)
-               case <-ps.terminator:
-                       break Processor
-               case data = <-ps.tap.Sink:
-                       ps.peer.EthProcess(data)
-               }
-       }
-       close(ps.terminator)
-       ps.peer.Zero()
-       heartbeat.Stop()
-}
-
-func callUp(peerId *govpn.PeerId, remoteAddr string) (string, error) {
-       ifaceName := confs[*peerId].Iface
-       if confs[*peerId].Up != "" {
-               result, err := govpn.ScriptCall(confs[*peerId].Up, ifaceName, remoteAddr)
+func callUp(peerID *govpn.PeerID, remoteAddr string) (string, error) {
+       ifaceName := confs[*peerID].Iface
+       if confs[*peerID].Up != "" {
+               result, err := govpn.ScriptCall(confs[*peerID].Up, ifaceName, remoteAddr)
                if err != nil {
-                       govpn.Println("Script", confs[*peerId].Up, "call failed", err)
+                       govpn.Printf(
+                               `[script-failed bind="%s" path="%s" err="%s"]`,
+                               *bindAddr,
+                               confs[*peerID].Up,
+                               err,
+                       )
                        return "", err
                }
                if ifaceName == "" {
@@ -82,7 +60,7 @@ func callUp(peerId *govpn.PeerId, remoteAddr string) (string, error) {
                }
        }
        if ifaceName == "" {
-               govpn.Println("Can not obtain interface name for", *peerId)
+               govpn.Printf(`[tap-failed bind="%s" peer="%s"]`, *bindAddr, *peerID)
        }
        return ifaceName, nil
 }