Revert "Remove stillAlive code from TUN/TAP conn as it is no longer required with the new deadlines"

This reverts commit eec70bf2f22028a1cae5fe60f8a89dfbb84bc1b0.
This commit is contained in:
Neil Alexander 2019-07-17 19:43:29 +01:00
parent eec70bf2f2
commit 1bf1c6eb36
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
2 changed files with 36 additions and 10 deletions

View File

@ -64,19 +64,16 @@ func (s *tunConn) reader() error {
s.conn.SetReadDeadline(time.Now().Add(tunConnTimeout)) s.conn.SetReadDeadline(time.Now().Add(tunConnTimeout))
if n, err = s.conn.Read(b); err != nil { if n, err = s.conn.Read(b); err != nil {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn read error:", err) s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn read error:", err)
if e, eok := err.(yggdrasil.ConnError); eok && !e.Temporary() { if e, eok := err.(yggdrasil.ConnError); eok {
s.tun.log.Debugln("Conn reader helper", s, "error:", e) s.tun.log.Debugln("Conn reader helper", s, "error:", e)
switch { switch {
// The timeout probably means we've waited for the timeout period and case e.Temporary():
// nothing has happened so close the connection fallthrough
case e.Timeout(): case e.Timeout():
s.close() read <- false
continue continue
// The connection is already closed, so we anticipate that the main
// reader goroutine has already exited. Also stop in that case
case e.Closed(): case e.Closed():
return fallthrough
// Some other case that we don't know about - close the connection
default: default:
s.close() s.close()
return return
@ -89,7 +86,7 @@ func (s *tunConn) reader() error {
}() }()
for { for {
select { select {
case r := <-read: case r, ok := <-read:
if r && n > 0 { if r && n > 0 {
bs := append(util.GetBytes(), b[:n]...) bs := append(util.GetBytes(), b[:n]...)
select { select {
@ -98,6 +95,9 @@ func (s *tunConn) reader() error {
util.PutBytes(bs) util.PutBytes(bs)
} }
} }
if ok {
s.stillAlive() // TODO? Only stay alive if we read >0 bytes?
}
case <-s.stop: case <-s.stop:
return nil return nil
} }
@ -123,7 +123,6 @@ func (s *tunConn) writer() error {
return errors.New("send closed") return errors.New("send closed")
} }
// TODO write timeout and close // TODO write timeout and close
s.conn.SetWriteDeadline(time.Now().Add(tunConnTimeout))
if _, err := s.conn.Write(b); err != nil { if _, err := s.conn.Write(b); err != nil {
e, eok := err.(yggdrasil.ConnError) e, eok := err.(yggdrasil.ConnError)
if !eok { if !eok {
@ -142,6 +141,32 @@ func (s *tunConn) writer() error {
} }
} }
util.PutBytes(b) util.PutBytes(b)
s.stillAlive()
}
}
}
func (s *tunConn) stillAlive() {
select {
case s.alive <- struct{}{}:
default:
}
}
func (s *tunConn) checkForTimeouts() error {
timer := time.NewTimer(tunConnTimeout)
defer util.TimerStop(timer)
defer s.close()
for {
select {
case _, ok := <-s.alive:
if !ok {
return errors.New("connection closed")
}
util.TimerStop(timer)
timer.Reset(tunConnTimeout)
case <-timer.C:
return errors.New("timed out")
} }
} }
} }

View File

@ -259,6 +259,7 @@ func (tun *TunAdapter) wrap(conn *yggdrasil.Conn) (c *tunConn, err error) {
// Start the connection goroutines // Start the connection goroutines
go s.reader() go s.reader()
go s.writer() go s.writer()
go s.checkForTimeouts()
// Return // Return
return c, err return c, err
} }