cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-13 01:40:27 +00:00
Code Releases Activity

have tuntap code use Conn.ReadNoCopy and Conn.WriteNoCopy to avoid copying between slices

Browse Source
This commit is contained in:
Arceliar 2019-08-04 15:59:51 -05:00
parent 5d5486049b
commit 6803f209b0
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tuntap/conn.go
View File

@ -53,15 +53,14 @@ func (s *tunConn) reader() (err error) {
} }
s.tun.log.Debugln("Starting conn reader for", s.conn.String()) s.tun.log.Debugln("Starting conn reader for", s.conn.String())
defer s.tun.log.Debugln("Stopping conn reader for", s.conn.String()) defer s.tun.log.Debugln("Stopping conn reader for", s.conn.String())
var n int
for { for {
select { select {
case <-s.stop: case <-s.stop:
return nil return nil
default: default:
} }
b := util.ResizeBytes(util.GetBytes(), 65535) var bs []byte
if n, err = s.conn.Read(b); err != nil { if bs, err = s.conn.ReadNoCopy(); err != nil {
if e, eok := err.(yggdrasil.ConnError); eok && !e.Temporary() { if e, eok := err.(yggdrasil.ConnError); eok && !e.Temporary() {
if e.Closed() { if e.Closed() {
s.tun.log.Debugln(s.conn.String(), "TUN/TAP conn read debug:", err) s.tun.log.Debugln(s.conn.String(), "TUN/TAP conn read debug:", err)
@ -70,11 +69,11 @@ func (s *tunConn) reader() (err error) {
} }
return e return e
} }
} else if n > 0 { } else if len(bs) > 0 {
s.tun.send <- b[:n] s.tun.send <- bs
s.stillAlive() s.stillAlive()
} else { } else {
util.PutBytes(b) util.PutBytes(bs)
} }
} }
} }
@ -93,12 +92,12 @@ func (s *tunConn) writer() error {
select { select {
case <-s.stop: case <-s.stop:
return nil return nil
case b, ok := <-s.send: case bs, ok := <-s.send:
if !ok { if !ok {
return errors.New("send closed") return errors.New("send closed")
} }
// TODO write timeout and close // TODO write timeout and close
if _, err := s.conn.Write(b); err != nil { if err := s.conn.WriteNoCopy(bs); err != nil {
if e, eok := err.(yggdrasil.ConnError); !eok { if e, eok := err.(yggdrasil.ConnError); !eok {
if e.Closed() { if e.Closed() {
s.tun.log.Debugln(s.conn.String(), "TUN/TAP generic write debug:", err) s.tun.log.Debugln(s.conn.String(), "TUN/TAP generic write debug:", err)
@ -109,9 +108,9 @@ func (s *tunConn) writer() error {
// 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{
MTU: int(e.PacketMaximumSize()), MTU: int(e.PacketMaximumSize()),
Data: b[:900], Data: bs[:900],
} }
if packet, err := CreateICMPv6(b[8:24], b[24:40], ipv6.ICMPTypePacketTooBig, 0, ptb); err == nil { if packet, err := CreateICMPv6(bs[8:24], bs[24:40], ipv6.ICMPTypePacketTooBig, 0, ptb); err == nil {
s.tun.send <- packet s.tun.send <- packet
} }
} else { } else {
@ -124,7 +123,6 @@ func (s *tunConn) writer() error {
} else { } else {
s.stillAlive() s.stillAlive()
} }
util.PutBytes(b)
} }
} }
} }