Break out mobile and dummy adapter

src/yggdrasil/core.go

@@ -280,6 +280,16 @@ func (c *Core) TreeID() *crypto.TreeID {
 	return crypto.GetTreeID(&c.sigPub)
 }
 
+// SigPubKey gets the node's signing public key.
+func (c *Core) SigPubKey() string {
+	return hex.EncodeToString(c.sigPub[:])
+}
+
+// BoxPubKey gets the node's encryption public key.
+func (c *Core) BoxPubKey() string {
+	return hex.EncodeToString(c.boxPub[:])
+}
+
 // Address gets the IPv6 address of the Yggdrasil node. This is always a /128
 // address.
 func (c *Core) Address() *net.IP {

src/yggdrasil/mobile.go

@@ -1,130 +0,0 @@
-// +build mobile
-
-package yggdrasil
-
-import (
-	"encoding/hex"
-	"encoding/json"
-	"os"
-	"time"
-
-	"github.com/gologme/log"
-
-	hjson "github.com/hjson/hjson-go"
-	"github.com/mitchellh/mapstructure"
-	"github.com/yggdrasil-network/yggdrasil-go/src/config"
-	"github.com/yggdrasil-network/yggdrasil-go/src/util"
-)
-
-// This file is meant to "plug the gap" for mobile support, as Gomobile will
-// not create headers for Swift/Obj-C etc if they have complex (non-native)
-// types. Therefore for iOS we will expose some nice simple functions. Note
-// that in the case of iOS we handle reading/writing to/from TUN in Swift
-// therefore we use the "dummy" TUN interface instead.
-
-func (c *Core) addStaticPeers(cfg *config.NodeConfig) {
-	if len(cfg.Peers) == 0 && len(cfg.InterfacePeers) == 0 {
-		return
-	}
-	for {
-		for _, peer := range cfg.Peers {
-			c.AddPeer(peer, "")
-			time.Sleep(time.Second)
-		}
-		for intf, intfpeers := range cfg.InterfacePeers {
-			for _, peer := range intfpeers {
-				c.AddPeer(peer, intf)
-				time.Sleep(time.Second)
-			}
-		}
-		time.Sleep(time.Minute)
-	}
-}
-
-// Starts a node with a randomly generated config.
-func (c *Core) StartAutoconfigure() error {
-	mobilelog := MobileLogger{}
-	logger := log.New(mobilelog, "", 0)
-	nc := config.GenerateConfig()
-	nc.IfName = "dummy"
-	nc.AdminListen = "tcp://localhost:9001"
-	nc.Peers = []string{}
-	if hostname, err := os.Hostname(); err == nil {
-		nc.NodeInfo = map[string]interface{}{"name": hostname}
-	}
-	if _, err := c.Start(nc, logger); err != nil {
-		return err
-	}
-	go c.addStaticPeers(nc)
-	return nil
-}
-
-// Starts a node with the given JSON config. You can get JSON config (rather
-// than HJSON) by using the GenerateConfigJSON() function.
-func (c *Core) StartJSON(configjson []byte) error {
-	mobilelog := MobileLogger{}
-	logger := log.New(mobilelog, "", 0)
-	nc := config.GenerateConfig()
-	var dat map[string]interface{}
-	if err := hjson.Unmarshal(configjson, &dat); err != nil {
-		return err
-	}
-	if err := mapstructure.Decode(dat, &nc); err != nil {
-		return err
-	}
-	nc.IfName = "dummy"
-	if _, err := c.Start(nc, logger); err != nil {
-		return err
-	}
-	go c.addStaticPeers(nc)
-	return nil
-}
-
-// Generates mobile-friendly configuration in JSON format.
-func GenerateConfigJSON() []byte {
-	nc := config.GenerateConfig()
-	nc.IfName = "dummy"
-	if json, err := json.Marshal(nc); err == nil {
-		return json
-	} else {
-		return nil
-	}
-}
-
-// Gets the node's IPv6 address.
-func (c *Core) GetAddressString() string {
-	return c.Address().String()
-}
-
-// Gets the node's IPv6 subnet in CIDR notation.
-func (c *Core) GetSubnetString() string {
-	return c.Subnet().String()
-}
-
-// Gets the node's public encryption key.
-func (c *Core) GetBoxPubKeyString() string {
-	return hex.EncodeToString(c.boxPub[:])
-}
-
-// Gets the node's public signing key.
-func (c *Core) GetSigPubKeyString() string {
-	return hex.EncodeToString(c.sigPub[:])
-}
-
-// Wait for a packet from the router. You will use this when implementing a
-// 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.recv
-	return packet, nil
-}
-
-// Send a packet to the router. You will use this when implementing a
-// dummy adapter in place of real TUN - when the operating system tells you
-// that a new packet is available from TUN, call this function to give it to
-// Yggdrasil.
-func (c *Core) RouterSendPacket(buf []byte) error {
-	packet := append(util.GetBytes(), buf[:]...)
-	c.router.send <- packet
-	return nil
-}

src/yggdrasil/mobile_android.go

@@ -1,12 +0,0 @@
-// +build android
-
-package yggdrasil
-
-import "log"
-
-type MobileLogger struct{}
-
-func (nsl MobileLogger) Write(p []byte) (n int, err error) {
-	log.Println(string(p))
-	return len(p), nil
-}

src/yggdrasil/mobile_ios.go

@@ -1,61 +0,0 @@
-// +build mobile,darwin
-
-package yggdrasil
-
-/*
-#cgo CFLAGS: -x objective-c
-#cgo LDFLAGS: -framework Foundation
-#import <Foundation/Foundation.h>
-void Log(const char *text) {
-  NSString *nss = [NSString stringWithUTF8String:text];
-  NSLog(@"%@", nss);
-}
-*/
-import "C"
-import (
-	"unsafe"
-)
-
-type MobileLogger struct {
-}
-
-func (nsl MobileLogger) Write(p []byte) (n int, err error) {
-	p = append(p, 0)
-	cstr := (*C.char)(unsafe.Pointer(&p[0]))
-	C.Log(cstr)
-	return len(p), nil
-}
-
-/*
-func (c *Core) AWDLCreateInterface(name, local, remote string, incoming bool) error {
-	if intf, err := c.link.awdl.create(name, local, remote, incoming); err != nil || intf == nil {
-		c.log.Println("c.link.awdl.create:", err)
-		return err
-	}
-	return nil
-}
-
-func (c *Core) AWDLShutdownInterface(name string) error {
-	return c.link.awdl.shutdown(name)
-}
-
-func (c *Core) AWDLRecvPacket(identity string) ([]byte, error) {
-	if intf := c.link.awdl.getInterface(identity); intf != nil {
-		read, ok := <-intf.rwc.toAWDL
-		if !ok {
-			return nil, errors.New("AWDLRecvPacket: channel closed")
-		}
-		return read, nil
-	}
-	return nil, errors.New("AWDLRecvPacket identity not known: " + identity)
-}
-
-func (c *Core) AWDLSendPacket(identity string, buf []byte) error {
-	packet := append(util.GetBytes(), buf[:]...)
-	if intf := c.link.awdl.getInterface(identity); intf != nil {
-		intf.rwc.fromAWDL <- packet
-		return nil
-	}
-	return errors.New("AWDLSendPacket identity not known: " + identity)
-}
-*/