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

manual merge

This commit is contained in:
Arceliar
2018-03-03 11:07:08 -06:00
2 changed files with 3 additions and 11 deletions

View File

@ -170,11 +170,7 @@ func (r *router) sendPacket(bs []byte) {
// Don't continue - drop the packet
return
}
select {
case sinfo.send <- bs:
default:
util_putBytes(bs)
}
sinfo.send <- bs
}
}
@ -225,11 +221,7 @@ func (r *router) handleTraffic(packet []byte) {
return
}
//go func () { sinfo.recv<-&p }()
select {
case sinfo.recv <- &p:
default:
util_putBytes(p.payload)
}
sinfo.recv <- &p
}
func (r *router) handleProto(packet []byte) {