TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-12-24 16:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #470 from neilalexander/conndebug

Browse Source 
Redirect Conn session closure errors to debug channel
This commit is contained in:
Neil Alexander 2019-07-23 08:14:38 +01:00 committed by GitHub
commit 837eb0131b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tuntap/conn.go
View File

@ -63,7 +63,11 @@ func (s *tunConn) reader() (err error) {
} }
if n, err = s.conn.Read(b); err != nil { if n, err = s.conn.Read(b); err != nil {
if e, eok := err.(yggdrasil.ConnError); eok && !e.Temporary() { if e, eok := err.(yggdrasil.ConnError); eok && !e.Temporary() {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn read error:", err) if e.Closed() {
s.tun.log.Debugln(s.conn.String(), "TUN/TAP conn read debug:", err)
} else {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn read error:", err)
}
return e return e
} }
} else if n > 0 { } else if n > 0 {
@ -98,9 +102,12 @@ func (s *tunConn) writer() error {
} }
// TODO write timeout and close // TODO write timeout and close
if _, err := s.conn.Write(b); err != nil { if _, err := s.conn.Write(b); err != nil {
e, eok := err.(yggdrasil.ConnError) if e, eok := err.(yggdrasil.ConnError); !eok {
if !eok { if e.Closed() {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP generic write error:", err) s.tun.log.Debugln(s.conn.String(), "TUN/TAP generic write debug:", err)
} else {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP generic write error:", err)
}
} else if ispackettoobig, maxsize := e.PacketTooBig(); ispackettoobig { } else if ispackettoobig, maxsize := e.PacketTooBig(); ispackettoobig {
// TODO: This currently isn't aware of IPv4 for CKR // TODO: This currently isn't aware of IPv4 for CKR
ptb := &icmp.PacketTooBig{ ptb := &icmp.PacketTooBig{
@ -111,7 +118,11 @@ func (s *tunConn) writer() error {
s.tun.send <- packet s.tun.send <- packet
} }
} else { } else {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn write error:", err) if e.Closed() {
s.tun.log.Debugln(s.conn.String(), "TUN/TAP conn write debug:", err)
} else {
s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn write error:", err)
}
} }
} else { } else {
s.stillAlive() s.stillAlive()