Optional HTTP-server providing with known peers information in JSON

[govpn.git] / cmd / govpn-server / main.go

diff --git a/cmd/govpn-server/main.go b/cmd/govpn-server/main.go
index 1ce5a3748cd02d391f311f64adb6c090c0eaee84..2761d340a1b85b032731c31f9982675d225771a8 100644 (file)
--- a/cmd/govpn-server/main.go
+++ b/cmd/govpn-server/main.go
@@ -35,6 +35,7 @@ import (
 var (
        bindAddr  = flag.String("bind", "[::]:1194", "Bind to address")
        peersPath = flag.String("peers", "peers", "Path to peers keys directory")
+       stats     = flag.String("stats", "", "Enable stats retrieving on host:port")
        mtu       = flag.Int("mtu", 1500, "MTU")
        nonceDiff = flag.Int("noncediff", 1, "Allow nonce difference")
        timeoutP  = flag.Int("timeout", 60, "Timeout seconds")
@@ -110,13 +111,24 @@ func main() {
        states := make(map[string]*govpn.Handshake)
        peers := make(map[string]*PeerState)
        peerReadySink := make(chan PeerReadyEvent)
+       knownPeers := govpn.KnownPeers(make(map[string]**govpn.Peer))
        var peerReady PeerReadyEvent
        var udpPkt *govpn.UDPPkt
        var udpPktData []byte
        var ethEvent EthEvent
+       var peerId *govpn.PeerId
+       var handshakeProcessForce bool
        ethSink := make(chan EthEvent)
 
-       log.Println("Server version", govpn.Version)
+       log.Println(govpn.VersionGet())
+       if *stats != "" {
+               log.Println("Stats are going to listen on", *stats)
+               statsPort, err := net.Listen("tcp", *stats)
+               if err != nil {
+                       panic(err)
+               }
+               go govpn.StatsProcessor(statsPort, &knownPeers)
+       }
        log.Println("Server started")
 
 MainCycle:
@@ -137,6 +149,7 @@ MainCycle:
                                if state.peer.LastPing.Add(timeout).Before(now) {
                                        log.Println("Deleting peer", state.peer)
                                        delete(peers, addr)
+                                       delete(knownPeers, addr)
                                        downPath := path.Join(
                                                govpn.PeersPath,
                                                state.peer.Id.String(),
@@ -153,6 +166,7 @@ MainCycle:
                                        continue
                                }
                                delete(peers, addr)
+                               delete(knownPeers, addr)
                                state.terminate <- struct{}{}
                                state.peer.Zero()
                                break
@@ -163,6 +177,7 @@ MainCycle:
                                continue
                        }
                        peers[addr] = state
+                       knownPeers[addr] = &peerReady.peer
                        states[addr].Zero()
                        delete(states, addr)
                        log.Println("Registered interface", peerReady.iface, "with peer", peer)
@@ -187,13 +202,21 @@ MainCycle:
                        }
                        udpPktData = udpBuf[:udpPkt.Size]
                        addr = udpPkt.Addr.String()
-                       if govpn.IsValidHandshakePkt(udpPktData) {
+                       handshakeProcessForce = false
+               HandshakeProcess:
+                       if _, exists = peers[addr]; handshakeProcessForce || !exists {
+                               peerId = govpn.IDsCache.Find(udpPktData)
+                               if peerId == nil {
+                                       log.Println("Unknown identity from", addr)
+                                       udpReady <- struct{}{}
+                                       continue
+                               }
                                state, exists = states[addr]
                                if !exists {
                                        state = govpn.HandshakeNew(udpPkt.Addr)
                                        states[addr] = state
                                }
-                               peer = state.Server(conn, udpPktData)
+                               peer = state.Server(peerId, conn, udpPktData)
                                if peer != nil {
                                        log.Println("Peer handshake finished", peer)
                                        if _, exists = peers[addr]; exists {
@@ -216,7 +239,9 @@ MainCycle:
                                                }()
                                        }
                                }
-                               udpReady <- struct{}{}
+                               if !handshakeProcessForce {
+                                       udpReady <- struct{}{}
+                               }
                                continue
                        }
                        peerState, exists = peers[addr]
@@ -224,7 +249,12 @@ MainCycle:
                                udpReady <- struct{}{}
                                continue
                        }
-                       peerState.peer.UDPProcess(udpPktData, peerState.tap, udpReady)
+                       // If it fails during processing, then try to work with it
+                       // as with handshake packet
+                       if !peerState.peer.UDPProcess(udpPktData, peerState.tap, udpReady) {
+                               handshakeProcessForce = true
+                               goto HandshakeProcess
+                       }
                }
        }
 }