mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-12-23 12:15:39 +00:00
Remove stillAlive code from TUN/TAP conn as it is no longer required with the new deadlines
This commit is contained in:
parent
7d1c03d2ac
commit
eec70bf2f2
@ -64,16 +64,19 @@ func (s *tunConn) reader() error {
|
||||
s.conn.SetReadDeadline(time.Now().Add(tunConnTimeout))
|
||||
if n, err = s.conn.Read(b); err != nil {
|
||||
s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn read error:", err)
|
||||
if e, eok := err.(yggdrasil.ConnError); eok {
|
||||
if e, eok := err.(yggdrasil.ConnError); eok && !e.Temporary() {
|
||||
s.tun.log.Debugln("Conn reader helper", s, "error:", e)
|
||||
switch {
|
||||
case e.Temporary():
|
||||
fallthrough
|
||||
// The timeout probably means we've waited for the timeout period and
|
||||
// nothing has happened so close the connection
|
||||
case e.Timeout():
|
||||
read <- false
|
||||
s.close()
|
||||
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():
|
||||
fallthrough
|
||||
return
|
||||
// Some other case that we don't know about - close the connection
|
||||
default:
|
||||
s.close()
|
||||
return
|
||||
@ -86,7 +89,7 @@ func (s *tunConn) reader() error {
|
||||
}()
|
||||
for {
|
||||
select {
|
||||
case r, ok := <-read:
|
||||
case r := <-read:
|
||||
if r && n > 0 {
|
||||
bs := append(util.GetBytes(), b[:n]...)
|
||||
select {
|
||||
@ -95,9 +98,6 @@ func (s *tunConn) reader() error {
|
||||
util.PutBytes(bs)
|
||||
}
|
||||
}
|
||||
if ok {
|
||||
s.stillAlive() // TODO? Only stay alive if we read >0 bytes?
|
||||
}
|
||||
case <-s.stop:
|
||||
return nil
|
||||
}
|
||||
@ -123,6 +123,7 @@ func (s *tunConn) writer() error {
|
||||
return errors.New("send closed")
|
||||
}
|
||||
// TODO write timeout and close
|
||||
s.conn.SetWriteDeadline(time.Now().Add(tunConnTimeout))
|
||||
if _, err := s.conn.Write(b); err != nil {
|
||||
e, eok := err.(yggdrasil.ConnError)
|
||||
if !eok {
|
||||
@ -141,32 +142,6 @@ func (s *tunConn) writer() error {
|
||||
}
|
||||
}
|
||||
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")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -259,7 +259,6 @@ func (tun *TunAdapter) wrap(conn *yggdrasil.Conn) (c *tunConn, err error) {
|
||||
// Start the connection goroutines
|
||||
go s.reader()
|
||||
go s.writer()
|
||||
go s.checkForTimeouts()
|
||||
// Return
|
||||
return c, err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user