yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 22:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Further tweaks

Browse source
This commit is contained in:
Neil Alexander 2019-01-23 17:05:16 +00:00
parent 81545fd9bf
commit 2944be4faf
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/yggdrasil/awdl.go
View file

@ -2,6 +2,7 @@ package yggdrasil
import (
"errors"
"io"
"sync"
)
@ -24,8 +25,13 @@ type awdlReadWriteCloser struct {
}
func (c awdlReadWriteCloser) Read(p []byte) (n int, err error) {
p = <-c.fromAWDL
return len(p), nil
select {
case packet := <-c.fromAWDL:
n = copy(p, packet)
return n, nil
default:
return 0, io.EOF
}
}
func (c awdlReadWriteCloser) Write(p []byte) (n int, err error) {
@ -48,10 +54,10 @@ func (l *awdl) init(c *Core) error {
return nil
}
func (l *awdl) create(fromAWDL chan []byte, toAWDL chan []byte, name, local, remote string) (*awdlInterface, error) {
func (l *awdl) create(name, local, remote string) (*awdlInterface, error) {
rwc := awdlReadWriteCloser{
fromAWDL: fromAWDL,
toAWDL: toAWDL,
fromAWDL: make(chan []byte, 1),
toAWDL: make(chan []byte, 1),
}
s := stream{}
s.init(rwc)
@ -66,7 +72,7 @@ func (l *awdl) create(fromAWDL chan []byte, toAWDL chan []byte, name, local, rem
l.mutex.Lock()
l.interfaces[name] = &intf
l.mutex.Unlock()
go link.handler()
go intf.link.handler()
return &intf, nil
}