cwinfo/yggdrasil-go
4
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2025-06-15 15:36:06 +00:00
Code Releases Activity

upgrade phony dependency and switch to its new interface

Browse Source
This commit is contained in:
Arceliar
2019-08-25 10:36:09 -05:00
parent cff1366146
commit aa30c6cc98
10 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tuntap/conn.go
View File

@ -17,7 +17,7 @@ import (
const tunConnTimeout = 2 * time.Minute
type tunConn struct {
phony.Actor
phony.Inbox
tun *TunAdapter
conn *yggdrasil.Conn
addr address.Address
@ -198,7 +198,7 @@ func (s *tunConn) _write(bs []byte) (err error) {
// No point in wasting resources to send back an error if there was none
return
}
s.EnqueueFrom(s.conn, func() {
s.RecvFrom(s.conn, func() {
if e, eok := err.(yggdrasil.ConnError); !eok {
if e.Closed() {
s.tun.log.Debugln(s.conn.String(), "TUN/TAP generic write debug:", err)

2
src/tuntap/tun.go
View File

@ -257,7 +257,7 @@ func (tun *TunAdapter) wrap(conn *yggdrasil.Conn) (c *tunConn, err error) {
tun.subnetToConn[s.snet] = &s
// Set the read callback and start the timeout goroutine
conn.SetReadCallback(func(bs []byte) {
s.EnqueueFrom(conn, func() {
s.RecvFrom(conn, func() {
s._read(bs)
})
})