]> Cypherpunks.ru repositories - govpn.git/blobdiff - src/govpn/cmd/govpn-server/tcp.go
Huge code refactoring
[govpn.git] / src / govpn / cmd / govpn-server / tcp.go
index d02565c6138c8ac08a94c60b8d7ed10a2ba92313..8aedfa9345dbb7b204a8b221f96d8381bccbfd98 100644 (file)
@@ -19,28 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+       "bytes"
        "encoding/binary"
        "log"
        "net"
+       "time"
 
        "govpn"
 )
 
-type TCPSender struct {
-       conn net.Conn
-}
-
-func (c TCPSender) Write(data []byte) (int, error) {
-       size := make([]byte, 2)
-       binary.BigEndian.PutUint16(size, uint16(len(data)))
-       return c.conn.Write(append(size, data...))
-}
-
-func (c TCPSender) Reorderable() bool {
-       return false
-}
-
-func startTCP(sink chan Pkt) {
+func startTCP() {
        bind, err := net.ResolveTCPAddr("tcp", *bindAddr)
        if err != nil {
                log.Fatalln("Can not resolve bind address:", err)
@@ -52,59 +40,148 @@ func startTCP(sink chan Pkt) {
        log.Println("Listening on TCP", *bindAddr)
        go func() {
                for {
-                       conn, _ := listener.AcceptTCP()
-                       ready := make(chan struct{}, 1)
-                       go handleTCP(conn, sink, ready)
-                       ready <- struct{}{}
+                       conn, err := listener.AcceptTCP()
+                       if err != nil {
+                               log.Println("Error accepting TCP:", err)
+                               continue
+                       }
+                       go handleTCP(conn)
                }
        }()
 }
 
-func handleTCP(conn net.Conn, sink chan Pkt, ready chan struct{}) {
+func handleTCP(conn net.Conn) {
        addr := conn.RemoteAddr().String()
-       var err error
-       var n int
-       var sizeNbuf int
-       sizeBuf := make([]byte, 2)
-       var sizeNeed uint16
-       var bufN uint16
        buf := make([]byte, govpn.MTU)
+       var n int
+       var err error
+       var prev int
+       var hs *govpn.Handshake
+       var ps *PeerState
+       var peer *govpn.Peer
+       var tap *govpn.TAP
+       var conf *govpn.PeerConf
        for {
-               <-ready
-               if sizeNbuf != 2 {
-                       n, err = conn.Read(sizeBuf[sizeNbuf:2])
-                       if err != nil {
+               if prev == govpn.MTU {
+                       break
+               }
+               conn.SetReadDeadline(time.Now().Add(time.Duration(govpn.TimeoutDefault) * time.Second))
+               n, err = conn.Read(buf[prev:])
+               if err != nil {
+                       // Either EOFed or timeouted
+                       break
+               }
+               prev += n
+               peerId := govpn.IDsCache.Find(buf[:prev])
+               if peerId == nil {
+                       continue
+               }
+               if hs == nil {
+                       conf = peerId.Conf()
+                       if conf == nil {
+                               log.Println("Can not get peer configuration:", peerId.String())
                                break
                        }
-                       sizeNbuf += n
-                       if sizeNbuf != 2 {
-                               sink <- Pkt{ready: ready}
-                               continue
+                       hs = govpn.NewHandshake(addr, conn, conf)
+               }
+               peer = hs.Server(buf[:prev])
+               prev = 0
+               if peer == nil {
+                       continue
+               }
+               hs.Zero()
+               peersByIdLock.RLock()
+               addrPrev, exists := peersById[*peer.Id]
+               peersByIdLock.RUnlock()
+               if exists {
+                       peersLock.RLock()
+                       tap = peers[addrPrev].tap
+                       ps = &PeerState{
+                               peer:       peer,
+                               tap:        tap,
+                               terminator: peers[addrPrev].terminator,
                        }
-                       sizeNeed = binary.BigEndian.Uint16(sizeBuf)
-                       if int(sizeNeed) > govpn.MTU-2 {
-                               log.Println("Invalid TCP size, skipping")
-                               sizeNbuf = 0
-                               sink <- Pkt{ready: ready}
-                               continue
+                       peersLock.RUnlock()
+                       ps.terminator <- struct{}{}
+                       peersLock.Lock()
+                       peersByIdLock.Lock()
+                       kpLock.Lock()
+                       delete(peers, addrPrev)
+                       delete(knownPeers, addrPrev)
+                       delete(peersById, *peer.Id)
+                       peers[addr] = ps
+                       knownPeers[addr] = &peer
+                       peersById[*peer.Id] = addr
+                       peersLock.Unlock()
+                       peersByIdLock.Unlock()
+                       kpLock.Unlock()
+                       go peerReady(*ps)
+                       log.Println("Rehandshake finished:", peer.Id.String())
+               } else {
+                       ifaceName, err := callUp(peer.Id)
+                       if err != nil {
+                               break
                        }
-                       bufN = 0
-               }
-       ReadMore:
-               if sizeNeed != bufN {
-                       n, err = conn.Read(buf[bufN:sizeNeed])
+                       tap, err = govpn.TAPListen(ifaceName)
                        if err != nil {
+                               log.Println("Unable to create TAP:", err)
                                break
                        }
-                       bufN += uint16(n)
-                       goto ReadMore
+                       ps = &PeerState{
+                               peer:       peer,
+                               tap:        tap,
+                               terminator: make(chan struct{}, 1),
+                       }
+                       go peerReady(*ps)
+                       peersLock.Lock()
+                       peersByIdLock.Lock()
+                       kpLock.Lock()
+                       peers[addr] = ps
+                       peersById[*peer.Id] = addr
+                       knownPeers[addr] = &peer
+                       peersLock.Unlock()
+                       peersByIdLock.Unlock()
+                       kpLock.Unlock()
+                       log.Println("New peer:", peer.Id.String())
+               }
+               break
+       }
+       if hs != nil {
+               hs.Zero()
+       }
+       if peer == nil {
+               return
+       }
+
+       nonceExpectation := make([]byte, govpn.NonceSize)
+       binary.BigEndian.PutUint64(nonceExpectation, peer.NonceExpect)
+       peer.NonceCipher.Encrypt(nonceExpectation, nonceExpectation)
+       prev = 0
+       var i int
+       for {
+               if prev == govpn.MTU {
+                       break
+               }
+               conn.SetReadDeadline(time.Now().Add(conf.Timeout))
+               n, err = conn.Read(buf[prev:])
+               if err != nil {
+                       // Either EOFed or timeouted
+                       break
+               }
+               prev += n
+       CheckMore:
+               i = bytes.Index(buf[:prev], nonceExpectation)
+               if i == -1 {
+                       continue
                }
-               sizeNbuf = 0
-               sink <- Pkt{
-                       addr,
-                       TCPSender{conn},
-                       buf[:sizeNeed],
-                       ready,
+               if !peer.PktProcess(buf[:i+govpn.NonceSize], tap, false) {
+                       break
                }
+               binary.BigEndian.PutUint64(nonceExpectation, peer.NonceExpect)
+               peer.NonceCipher.Encrypt(nonceExpectation, nonceExpectation)
+               copy(buf, buf[i+govpn.NonceSize:prev])
+               prev = prev - i - govpn.NonceSize
+               goto CheckMore
        }
+       peer.Zero()
 }