/*
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
var (
// Buffers for UDP parallel processing
- udpBufs chan []byte = make(chan []byte, 1<<8)
+ udpBufs = make(chan []byte, 1<<8)
)
func startUDP() {
var hs *govpn.Handshake
var addrPrev string
var exists bool
- var peerId *govpn.PeerId
- var peer *govpn.Peer
+ var peerID *govpn.PeerID
var conf *govpn.PeerConf
for {
buf = <-udpBufs
peersLock.RLock()
ps, exists = peers[addr]
peersLock.RUnlock()
- if !exists {
- goto CheckHandshake
+ if exists {
+ go func(peer *govpn.Peer, tap *govpn.TAP, buf []byte, n int) {
+ peer.PktProcess(buf[:n], tap, true)
+ udpBufs <- buf
+ }(ps.peer, ps.tap, buf, n)
+ continue
}
- go func(ps *govpn.Peer, tap *govpn.TAP, buf []byte, n int) {
- peer.PktProcess(buf[:n], tap, true)
- udpBufs <- buf
- }(ps.peer, ps.tap, buf, n)
- continue
- CheckHandshake:
+
hsLock.RLock()
hs, exists = handshakes[addr]
hsLock.RUnlock()
if !exists {
- goto CheckID
+ peerID = idsCache.Find(buf[:n])
+ if peerID == nil {
+ govpn.Printf(`[identity-unknown bind="%s" addr="%s"]`, *bindAddr, addr)
+ udpBufs <- buf
+ continue
+ }
+ conf = confs[*peerID]
+ if conf == nil {
+ govpn.Printf(
+ `[conf-get-failed bind="%s" peer="%s"]`,
+ *bindAddr, peerID.String(),
+ )
+ udpBufs <- buf
+ continue
+ }
+ hs := govpn.NewHandshake(
+ addr,
+ UDPSender{conn: conn, addr: raddr},
+ conf,
+ )
+ hs.Server(buf[:n])
+ udpBufs <- buf
+ hsLock.Lock()
+ handshakes[addr] = hs
+ hsLock.Unlock()
+ continue
}
- peer = hs.Server(buf[:n])
+
+ peer := hs.Server(buf[:n])
if peer == nil {
- goto Finished
+ udpBufs <- buf
+ continue
}
-
govpn.Printf(
`[handshake-completed bind="%s" addr="%s" peer="%s"]`,
- *bindAddr, addr, peerId.String(),
+ *bindAddr, addr, peerID.String(),
)
hs.Zero()
hsLock.Lock()
udpBufs <- make([]byte, govpn.MTUMax)
udpBufs <- make([]byte, govpn.MTUMax)
}()
- peersByIdLock.RLock()
- addrPrev, exists = peersById[*peer.Id]
- peersByIdLock.RUnlock()
+ peersByIDLock.RLock()
+ addrPrev, exists = peersByID[*peer.ID]
+ peersByIDLock.RUnlock()
if exists {
peersLock.Lock()
peers[addrPrev].terminator <- struct{}{}
- ps = &PeerState{
+ psNew := &PeerState{
peer: peer,
tap: peers[addrPrev].tap,
terminator: make(chan struct{}),
}
- go func(ps PeerState) {
- govpn.PeerTapProcessor(ps.peer, ps.tap, ps.terminator)
+ go func(peer *govpn.Peer, tap *govpn.TAP, terminator chan struct{}) {
+ govpn.PeerTapProcessor(peer, tap, terminator)
<-udpBufs
<-udpBufs
- }(*ps)
- peersByIdLock.Lock()
+ }(psNew.peer, psNew.tap, psNew.terminator)
+ peersByIDLock.Lock()
kpLock.Lock()
delete(peers, addrPrev)
delete(knownPeers, addrPrev)
- peers[addr] = ps
+ peers[addr] = psNew
knownPeers[addr] = &peer
- peersById[*peer.Id] = addr
+ peersByID[*peer.ID] = addr
peersLock.Unlock()
- peersByIdLock.Unlock()
+ peersByIDLock.Unlock()
kpLock.Unlock()
govpn.Printf(
`[rehandshake-completed bind="%s" peer="%s"]`,
- *bindAddr, peer.Id.String(),
+ *bindAddr, peer.ID.String(),
)
} else {
go func(addr string, peer *govpn.Peer) {
- ifaceName, err := callUp(peer.Id, peer.Addr)
+ ifaceName, err := callUp(peer.ID, peer.Addr)
if err != nil {
return
}
if err != nil {
govpn.Printf(
`[tap-failed bind="%s" peer="%s" err="%s"]`,
- *bindAddr, peer.Id.String(), err,
+ *bindAddr, peer.ID.String(), err,
)
return
}
- ps = &PeerState{
+ psNew := &PeerState{
peer: peer,
tap: tap,
terminator: make(chan struct{}),
}
- go func(ps PeerState) {
- govpn.PeerTapProcessor(ps.peer, ps.tap, ps.terminator)
+ go func(peer *govpn.Peer, tap *govpn.TAP, terminator chan struct{}) {
+ govpn.PeerTapProcessor(peer, tap, terminator)
<-udpBufs
<-udpBufs
- }(*ps)
+ }(psNew.peer, psNew.tap, psNew.terminator)
peersLock.Lock()
- peersByIdLock.Lock()
+ peersByIDLock.Lock()
kpLock.Lock()
- peers[addr] = ps
+ peers[addr] = psNew
knownPeers[addr] = &peer
- peersById[*peer.Id] = addr
+ peersByID[*peer.ID] = addr
peersLock.Unlock()
- peersByIdLock.Unlock()
+ peersByIDLock.Unlock()
kpLock.Unlock()
- govpn.Printf(`[peer-created bind="%s" peer="%s"]`, *bindAddr, peer.Id.String())
+ govpn.Printf(`[peer-created bind="%s" peer="%s"]`, *bindAddr, peer.ID.String())
}(addr, peer)
}
- goto Finished
- CheckID:
- peerId = idsCache.Find(buf[:n])
- if peerId == nil {
- govpn.Printf(`[identity-unknown bind="%s" addr="%s"]`, *bindAddr, addr)
- goto Finished
- }
- conf = confs[*peerId]
- if conf == nil {
- govpn.Printf(
- `[conf-get-failed bind="%s" peer="%s"]`,
- *bindAddr, peerId.String(),
- )
- goto Finished
- }
- hs = govpn.NewHandshake(
- addr,
- UDPSender{conn: conn, addr: raddr},
- conf,
- )
- hs.Server(buf[:n])
- hsLock.Lock()
- handshakes[addr] = hs
- hsLock.Unlock()
- Finished:
udpBufs <- buf
}
}()