yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-10-31 01:05:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rethink channels, more error throwing

Browse source
This commit is contained in:
Neil Alexander 2019-01-05 12:06:45 +00:00
parent 90366dd853
commit 6bbd8c1b30
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 53 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/yggdrasil/mobile.go
View file

@ -108,20 +108,24 @@ func (c *Core) AWDLCreateInterface(boxPubKey string, sigPubKey string, name stri
}
copy(boxPub[:], boxPubHex)
copy(sigPub[:], sigPubHex)
if intf := c.awdl.create(&boxPub, &sigPub, name); intf != nil {
return nil
if intf, err := c.awdl.create(&boxPub, &sigPub, name); err == nil {
if intf != nil {
return err
} else {
return errors.New("c.awdl.create didn't return an interface")
}
} else {
return errors.New("No interface was created")
return err
}
}
func (c *Core) AWDLShutdownInterface(name string) {
c.awdl.shutdown(name)
func (c *Core) AWDLShutdownInterface(name string) error {
return c.awdl.shutdown(name)
}
func (c *Core) AWDLRecvPacket(identity string) ([]byte, error) {
if intf := c.awdl.getInterface(identity); intf != nil {
return <-intf.recv, nil
return <-intf.toAWDL, nil
}
return nil, errors.New("identity not known: " + identity)
}
@ -129,7 +133,7 @@ func (c *Core) AWDLRecvPacket(identity string) ([]byte, error) {
func (c *Core) AWDLSendPacket(identity string, buf []byte) error {
packet := append(util.GetBytes(), buf[:]...)
if intf := c.awdl.getInterface(identity); intf != nil {
intf.send <- packet
intf.fromAWDL <- packet
return nil
}
return errors.New("identity not known: " + identity)