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

Unexport/modify some interfaces to revive broken iOS/Android builds

Browse source
This commit is contained in:
Neil Alexander 2019-03-30 00:09:35 +00:00
parent 4c0c3a23cb
commit 39baf7365c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
7 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/yggdrasil/mobile.go
View file

@ -52,7 +52,7 @@ func (c *Core) StartAutoconfigure() error {
if hostname, err := os.Hostname(); err == nil {
nc.NodeInfo = map[string]interface{}{"name": hostname}
}
if err := c.Start(nc, logger); err != nil {
if _, err := c.Start(nc, logger); err != nil {
return err
}
go c.addStaticPeers(nc)
@ -73,7 +73,7 @@ func (c *Core) StartJSON(configjson []byte) error {
return err
}
nc.IfName = "dummy"
if err := c.Start(nc, logger); err != nil {
if _, err := c.Start(nc, logger); err != nil {
return err
}
go c.addStaticPeers(nc)
@ -93,12 +93,12 @@ func GenerateConfigJSON() []byte {
// Gets the node's IPv6 address.
func (c *Core) GetAddressString() string {
return c.GetAddress().String()
return c.Address().String()
}
// Gets the node's IPv6 subnet in CIDR notation.
func (c *Core) GetSubnetString() string {
return c.GetSubnet().String()
return c.Subnet().String()
}
// Gets the node's public encryption key.
@ -115,7 +115,7 @@ func (c *Core) GetSigPubKeyString() string {
// dummy adapter in place of real TUN - when this call returns a packet, you
// will probably want to give it to the OS to write to TUN.
func (c *Core) RouterRecvPacket() ([]byte, error) {
packet := <-c.router.tun.Recv
packet := <-c.router.recv
return packet, nil
}
@ -125,6 +125,6 @@ func (c *Core) RouterRecvPacket() ([]byte, error) {
// Yggdrasil.
func (c *Core) RouterSendPacket(buf []byte) error {
packet := append(util.GetBytes(), buf[:]...)
c.router.tun.Send <- packet
c.router.send <- packet
return nil
}