diff --git a/.circleci/config.yml b/.circleci/config.yml
index e548aa1f..8725e443 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,13 +98,3 @@ jobs:
- store_artifacts:
path: /tmp/upload
destination: /
-
- - run:
- name: Create tags (master branch only)
- command: >
- if [ "${CIRCLE_BRANCH}" == "master" ]; then
- (git tag -a $(sh contrib/semver/version.sh) -m "Created by CircleCI" && git push --tags) || true;
- else
- echo "Only runs for master branch (this is ${CIRCLE_BRANCH})";
- fi;
- when: on_success
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c8994fd..84b5c38b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- in case of vulnerabilities.
-->
+## [0.3.2] - 2018-12-26
+### Added
+- The admin socket is now multithreaded, greatly improving performance of the crawler and allowing concurrent lookups to take place
+- The ability to hide NodeInfo defaults through either setting the `NodeInfoPrivacy` option or through setting individual `NodeInfo` attributes to `null`
+
+### Changed
+- The `armhf` build now targets ARMv6 instead of ARMv7, adding support for Raspberry Pi Zero and other older models, amongst others
+
+### Fixed
+- DHT entries are now populated using a copy in memory to fix various potential DHT bugs
+- DHT traffic should now throttle back exponentially to reduce idle traffic
+- Adjust how nodes are inserted into the DHT which should help to reduce some incorrect DHT traffic
+- In TAP mode, the NDP target address is now correctly used when populating the peer MAC table. This fixes serious connectivity problems when in TAP mode, particularly on BSD
+- In TUN mode, ICMPv6 packets are now ignored whereas they were incorrectly processed before
+
## [0.3.1] - 2018-12-17
### Added
- Build name and version is now imprinted onto the binaries if available/specified during build
diff --git a/build b/build
index e463c852..7ceb4c9a 100755
--- a/build
+++ b/build
@@ -6,12 +6,14 @@ PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)}
LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER"
-while getopts "udtc:l:" option
+while getopts "udaitc:l:" option
do
case "${option}"
in
u) UPX=true;;
d) DEBUG=true;;
+ i) IOS=true;;
+ a) ANDROID=true;;
t) TABLES=true;;
c) GCFLAGS="$GCFLAGS $OPTARG";;
l) LDFLAGS="$LDFLAGS $OPTARG";;
@@ -22,15 +24,23 @@ if [ -z $TABLES ]; then
STRIP="-s -w"
fi
-for CMD in `ls cmd/` ; do
- echo "Building: $CMD"
+if [ $IOS ]; then
+ echo "Building framework for iOS"
+ gomobile bind -target ios -tags mobile -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil
+elif [ $ANDROID ]; then
+ echo "Building aar for Android"
+ gomobile bind -target android -tags mobile -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil
+else
+ for CMD in `ls cmd/` ; do
+ echo "Building: $CMD"
- if [ $DEBUG ]; then
- go build -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" -tags debug -v ./cmd/$CMD
- else
- go build -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" -v ./cmd/$CMD
- fi
- if [ $UPX ]; then
- upx --brute $CMD
- fi
-done
+ if [ $DEBUG ]; then
+ go build -ldflags="$LDFLAGS" -gcflags="$GCFLAGS" -tags debug -v ./cmd/$CMD
+ else
+ go build -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" -v ./cmd/$CMD
+ fi
+ if [ $UPX ]; then
+ upx --brute $CMD
+ fi
+ done
+fi
diff --git a/clean b/clean
index 4361a7be..a1036764 100755
--- a/clean
+++ b/clean
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
git clean -dxf
diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go
index 5a9db26c..43cf77a7 100644
--- a/cmd/yggdrasil/main.go
+++ b/cmd/yggdrasil/main.go
@@ -2,13 +2,11 @@ package main
import (
"bytes"
- "encoding/hex"
"encoding/json"
"flag"
"fmt"
"io/ioutil"
"log"
- "math/rand"
"os"
"os/signal"
"regexp"
@@ -23,7 +21,6 @@ import (
"github.com/mitchellh/mapstructure"
"github.com/yggdrasil-network/yggdrasil-go/src/config"
- "github.com/yggdrasil-network/yggdrasil-go/src/defaults"
"github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil"
)
@@ -34,51 +31,10 @@ type node struct {
core Core
}
-// Generates default configuration. This is used when outputting the -genconf
-// parameter and also when using -autoconf. The isAutoconf flag is used to
-// determine whether the operating system should select a free port by itself
-// (which guarantees that there will not be a conflict with any other services)
-// or whether to generate a random port number. The only side effect of setting
-// isAutoconf is that the TCP and UDP ports will likely end up with different
-// port numbers.
-func generateConfig(isAutoconf bool) *nodeConfig {
- // Create a new core.
- core := Core{}
- // Generate encryption keys.
- bpub, bpriv := core.NewEncryptionKeys()
- spub, spriv := core.NewSigningKeys()
- // Create a node configuration and populate it.
- cfg := nodeConfig{}
- if isAutoconf {
- cfg.Listen = "[::]:0"
- } else {
- r1 := rand.New(rand.NewSource(time.Now().UnixNano()))
- cfg.Listen = fmt.Sprintf("[::]:%d", r1.Intn(65534-32768)+32768)
- }
- cfg.AdminListen = defaults.GetDefaults().DefaultAdminListen
- cfg.EncryptionPublicKey = hex.EncodeToString(bpub[:])
- cfg.EncryptionPrivateKey = hex.EncodeToString(bpriv[:])
- cfg.SigningPublicKey = hex.EncodeToString(spub[:])
- cfg.SigningPrivateKey = hex.EncodeToString(spriv[:])
- cfg.Peers = []string{}
- cfg.InterfacePeers = map[string][]string{}
- cfg.AllowedEncryptionPublicKeys = []string{}
- cfg.MulticastInterfaces = []string{".*"}
- cfg.IfName = defaults.GetDefaults().DefaultIfName
- cfg.IfMTU = defaults.GetDefaults().DefaultIfMTU
- cfg.IfTAPMode = defaults.GetDefaults().DefaultIfTAPMode
- cfg.SessionFirewall.Enable = false
- cfg.SessionFirewall.AllowFromDirect = true
- cfg.SessionFirewall.AllowFromRemote = true
- cfg.SwitchOptions.MaxTotalQueueSize = yggdrasil.SwitchQueueTotalMinSize
-
- return &cfg
-}
-
// Generates a new configuration and returns it in HJSON format. This is used
// with -genconf.
func doGenconf(isjson bool) string {
- cfg := generateConfig(false)
+ cfg := config.GenerateConfig(false)
var bs []byte
var err error
if isjson {
@@ -113,19 +69,19 @@ func main() {
case *autoconf:
// Use an autoconf-generated config, this will give us random keys and
// port numbers, and will use an automatically selected TUN/TAP interface.
- cfg = generateConfig(true)
+ cfg = config.GenerateConfig(true)
case *useconffile != "" || *useconf:
// Use a configuration file. If -useconf, the configuration will be read
// from stdin. If -useconffile, the configuration will be read from the
// filesystem.
- var config []byte
+ var configjson []byte
var err error
if *useconffile != "" {
// Read the file from the filesystem
- config, err = ioutil.ReadFile(*useconffile)
+ configjson, err = ioutil.ReadFile(*useconffile)
} else {
// Read the file from stdin.
- config, err = ioutil.ReadAll(os.Stdin)
+ configjson, err = ioutil.ReadAll(os.Stdin)
}
if err != nil {
panic(err)
@@ -134,11 +90,11 @@ func main() {
// throwing everywhere when it's converting things into UTF-16 for the hell
// of it - remove it and decode back down into UTF-8. This is necessary
// because hjson doesn't know what to do with UTF-16 and will panic
- if bytes.Compare(config[0:2], []byte{0xFF, 0xFE}) == 0 ||
- bytes.Compare(config[0:2], []byte{0xFE, 0xFF}) == 0 {
+ if bytes.Compare(configjson[0:2], []byte{0xFF, 0xFE}) == 0 ||
+ bytes.Compare(configjson[0:2], []byte{0xFE, 0xFF}) == 0 {
utf := unicode.UTF16(unicode.BigEndian, unicode.UseBOM)
decoder := utf.NewDecoder()
- config, err = decoder.Bytes(config)
+ configjson, err = decoder.Bytes(configjson)
if err != nil {
panic(err)
}
@@ -147,9 +103,9 @@ func main() {
// then parse the configuration we loaded above on top of it. The effect
// of this is that any configuration item that is missing from the provided
// configuration will use a sane default.
- cfg = generateConfig(false)
+ cfg = config.GenerateConfig(false)
var dat map[string]interface{}
- if err := hjson.Unmarshal(config, &dat); err != nil {
+ if err := hjson.Unmarshal(configjson, &dat); err != nil {
panic(err)
}
confJson, err := json.Marshal(dat)
diff --git a/contrib/logo/ygg-neilalexander.svg b/contrib/logo/ygg-neilalexander.svg
new file mode 100644
index 00000000..d2222002
--- /dev/null
+++ b/contrib/logo/ygg-neilalexander.svg
@@ -0,0 +1,157 @@
+
+
+
+
diff --git a/contrib/semver/name.sh b/contrib/semver/name.sh
index 935cc750..1fa2ce07 100644
--- a/contrib/semver/name.sh
+++ b/contrib/semver/name.sh
@@ -4,8 +4,8 @@
BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
# Complain if the git history is not available
-if [ $? != 0 ]; then
- printf "unknown"
+if [ $? != 0 ] || [ -z "$BRANCH" ]; then
+ printf "yggdrasil"
exit 1
fi
diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh
index 03b5da2c..3052094a 100644
--- a/contrib/semver/version.sh
+++ b/contrib/semver/version.sh
@@ -1,67 +1,46 @@
#!/bin/sh
-# Merge commits from this branch are counted
-DEVELOPBRANCH="yggdrasil-network/develop"
-
# Get the last tag
-TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.0" 2>/dev/null)
+TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null)
-# Get last merge to master
-MERGE=$(git rev-list $TAG..master --grep "from $DEVELOPBRANCH" 2>/dev/null | head -n 1)
-
-# Get the number of merges since the last merge to master
-PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" --first-parent master 2>/dev/null)
-
-# Decide whether we should prepend the version with "v" - the default is that
-# we do because we use it in git tags, but we might not always need it
-PREPEND="v"
-if [ "$1" = "--bare" ]; then
- PREPEND=""
+# Did getting the tag succeed?
+if [ $? != 0 ] || [ -z "$TAG" ]; then
+ printf -- "unknown"
+ exit 1
fi
-# If it fails then there's no last tag - go from the first commit
-if [ $? != 0 ]; then
- PATCH=$(git rev-list HEAD --count 2>/dev/null)
+# Get the current branch
+BRANCH=$(git symbolic-ref -q HEAD --short 2>/dev/null)
- # Complain if the git history is not available
- if [ $? != 0 ]; then
- printf 'unknown'
- exit 1
- fi
-
- printf '%s0.0.%d' "$PREPEND" "$PATCH"
- exit 1
+# Did getting the branch succeed?
+if [ $? != 0 ] || [ -z "$BRANCH" ]; then
+ BRANCH="master"
fi
# Split out into major, minor and patch numbers
MAJOR=$(echo $TAG | cut -c 2- | cut -d "." -f 1)
MINOR=$(echo $TAG | cut -c 2- | cut -d "." -f 2)
-
-# Get the current checked out branch
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
+PATCH=$(echo $TAG | cut -c 2- | cut -d "." -f 3)
# Output in the desired format
-if [ $PATCH = 0 ]; then
- if [ ! -z $FULL ]; then
- printf '%s%d.%d.0' "$PREPEND" "$MAJOR" "$MINOR"
- else
- printf '%s%d.%d' "$PREPEND" "$MAJOR" "$MINOR"
- fi
+if [ $((PATCH)) -eq 0 ]; then
+ printf '%s%d.%d' "$PREPEND" "$((MAJOR))" "$((MINOR))"
else
- printf '%s%d.%d.%d' "$PREPEND" "$MAJOR" "$MINOR" "$PATCH"
+ printf '%s%d.%d.%d' "$PREPEND" "$((MAJOR))" "$((MINOR))" "$((PATCH))"
fi
-# Get the number of merges on the current branch since the last tag
-TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" --first-parent master 2>/dev/null)
-BUILD=$(git rev-list $TAG.. --count)
-
# Add the build tag on non-master branches
-if [ $BRANCH != "master" ]; then
- if [ $BUILD != 0 ]; then
- printf -- "-%04d" "$BUILD"
+if [ "$BRANCH" != "master" ]; then
+ BUILD=$(git rev-list --count $TAG..HEAD 2>/dev/null)
+
+ # Did getting the count of commits since the tag succeed?
+ if [ $? != 0 ] || [ -z "$BUILD" ]; then
+ printf -- "-unknown"
+ exit 1
fi
-else
- if [ $BUILD != 0 ]; then
- printf -- "-%d" "$(($BUILD+1))"
+
+ # Is the build greater than zero?
+ if [ $((BUILD)) -gt 0 ]; then
+ printf -- "-%04d" "$((BUILD))"
fi
fi
diff --git a/doc/Whitepaper.md b/doc/Whitepaper.md
index 674f6dc0..26d49a53 100644
--- a/doc/Whitepaper.md
+++ b/doc/Whitepaper.md
@@ -63,7 +63,7 @@ These coordinates are used as a distance label.
Given the coordinates of any two nodes, it is possible to calculate the length of some real path through the network between the two nodes.
Traffic is forwarded using a [greedy routing](https://en.wikipedia.org/wiki/Small-world_routing#Greedy_routing) scheme, where each node forwards the packet to a one-hop neighbor that is closer to the destination (according to this distance metric) than the current node.
-In particular, when a packet needs to be forward, a node will forward it to whatever peer is closest to the destination in the greedy [metric space](https://en.wikipedia.org/wiki/Metric_space) used by the network, provided that the peer is closer to the destination than the current node.
+In particular, when a packet needs to be forwarded, a node will forward it to whatever peer is closest to the destination in the greedy [metric space](https://en.wikipedia.org/wiki/Metric_space) used by the network, provided that the peer is closer to the destination than the current node.
If no closer peers are idle, then the packet is queued in FIFO order, with separate queues per destination coords (currently, as a bit of a hack, IPv6 flow labels are embedeed after the end of the significant part of the coords, so queues distinguish between different traffic streams with the same destination).
Whenever the node finishes forwarding a packet to a peer, it checks the queues, and will forward the first packet from the queue with the maximum `/`, i.e. the bandwidth the queue is attempting to use, subject to the constraint that the peer is a valid next hop (i.e. closer to the destination than the current node).
diff --git a/src/config/config.go b/src/config/config.go
index b5a1f890..192b94e5 100644
--- a/src/config/config.go
+++ b/src/config/config.go
@@ -1,5 +1,15 @@
package config
+import (
+ "encoding/hex"
+ "fmt"
+ "math/rand"
+ "time"
+
+ "github.com/yggdrasil-network/yggdrasil-go/src/crypto"
+ "github.com/yggdrasil-network/yggdrasil-go/src/defaults"
+)
+
// NodeConfig defines all configuration values needed to run a signle yggdrasil node
type NodeConfig struct {
Listen string `comment:"Listen address for peer connections. Default is to listen for all\nTCP connections over IPv4 and IPv6 with a random port."`
@@ -19,6 +29,7 @@ type NodeConfig struct {
SessionFirewall SessionFirewall `comment:"The session firewall controls who can send/receive network traffic\nto/from. This is useful if you want to protect this node without\nresorting to using a real firewall. This does not affect traffic\nbeing routed via this node to somewhere else. Rules are prioritised as\nfollows: blacklist, whitelist, always allow outgoing, direct, remote."`
TunnelRouting TunnelRouting `comment:"Allow tunneling non-Yggdrasil traffic over Yggdrasil. This effectively\nallows you to use Yggdrasil to route to, or to bridge other networks,\nsimilar to a VPN tunnel. Tunnelling works between any two nodes and\ndoes not require them to be directly peered."`
SwitchOptions SwitchOptions `comment:"Advanced options for tuning the switch. Normally you will not need\nto edit these options."`
+ NodeInfoPrivacy bool `comment:"By default, nodeinfo contains some defaults including the platform,\narchitecture and Yggdrasil version. These can help when surveying\nthe network and diagnosing network routing problems. Enabling\nnodeinfo privacy prevents this, so that only items specified in\n\"NodeInfo\" are sent back if specified."`
NodeInfo map[string]interface{} `comment:"Optional node info. This must be a { \"key\": \"value\", ... } map\nor set as null. This is entirely optional but, if set, is visible\nto the whole network on request."`
//Net NetConfig `comment:"Extended options for connecting to peers over other networks."`
}
@@ -52,3 +63,45 @@ type TunnelRouting struct {
type SwitchOptions struct {
MaxTotalQueueSize uint64 `comment:"Maximum size of all switch queues combined (in bytes)."`
}
+
+// Generates default configuration. This is used when outputting the -genconf
+// parameter and also when using -autoconf. The isAutoconf flag is used to
+// determine whether the operating system should select a free port by itself
+// (which guarantees that there will not be a conflict with any other services)
+// or whether to generate a random port number. The only side effect of setting
+// isAutoconf is that the TCP and UDP ports will likely end up with different
+// port numbers.
+func GenerateConfig(isAutoconf bool) *NodeConfig {
+ // Create a new core.
+ //core := Core{}
+ // Generate encryption keys.
+ bpub, bpriv := crypto.NewBoxKeys()
+ spub, spriv := crypto.NewSigKeys()
+ // Create a node configuration and populate it.
+ cfg := NodeConfig{}
+ if isAutoconf {
+ cfg.Listen = "[::]:0"
+ } else {
+ r1 := rand.New(rand.NewSource(time.Now().UnixNano()))
+ cfg.Listen = fmt.Sprintf("[::]:%d", r1.Intn(65534-32768)+32768)
+ }
+ cfg.AdminListen = defaults.GetDefaults().DefaultAdminListen
+ cfg.EncryptionPublicKey = hex.EncodeToString(bpub[:])
+ cfg.EncryptionPrivateKey = hex.EncodeToString(bpriv[:])
+ cfg.SigningPublicKey = hex.EncodeToString(spub[:])
+ cfg.SigningPrivateKey = hex.EncodeToString(spriv[:])
+ cfg.Peers = []string{}
+ cfg.InterfacePeers = map[string][]string{}
+ cfg.AllowedEncryptionPublicKeys = []string{}
+ cfg.MulticastInterfaces = []string{".*"}
+ cfg.IfName = defaults.GetDefaults().DefaultIfName
+ cfg.IfMTU = defaults.GetDefaults().DefaultIfMTU
+ cfg.IfTAPMode = defaults.GetDefaults().DefaultIfTAPMode
+ cfg.SessionFirewall.Enable = false
+ cfg.SessionFirewall.AllowFromDirect = true
+ cfg.SessionFirewall.AllowFromRemote = true
+ cfg.SwitchOptions.MaxTotalQueueSize = 4 * 1024 * 1024
+ cfg.NodeInfoPrivacy = false
+
+ return &cfg
+}
diff --git a/src/yggdrasil/adapter.go b/src/yggdrasil/adapter.go
index 4a432092..7fb6a19e 100644
--- a/src/yggdrasil/adapter.go
+++ b/src/yggdrasil/adapter.go
@@ -1,17 +1,8 @@
package yggdrasil
-// Defines the minimum required functions for an adapter type.
-type AdapterInterface interface {
- init(core *Core, send chan<- []byte, recv <-chan []byte)
- read() error
- write() error
- close() error
-}
-
// Defines the minimum required struct members for an adapter type (this is
// now the base type for tunAdapter in tun.go)
type Adapter struct {
- AdapterInterface
core *Core
send chan<- []byte
recv <-chan []byte
diff --git a/src/yggdrasil/admin.go b/src/yggdrasil/admin.go
index bd3c9051..2496b309 100644
--- a/src/yggdrasil/admin.go
+++ b/src/yggdrasil/admin.go
@@ -324,12 +324,27 @@ func (a *admin) init(c *Core, listenaddr string) {
return admin_info{}, err
}
})
- a.addHandler("getNodeInfo", []string{"box_pub_key", "coords", "[nocache]"}, func(in admin_info) (admin_info, error) {
+ a.addHandler("getNodeInfo", []string{"[box_pub_key]", "[coords]", "[nocache]"}, func(in admin_info) (admin_info, error) {
var nocache bool
if in["nocache"] != nil {
nocache = in["nocache"].(string) == "true"
}
- result, err := a.admin_getNodeInfo(in["box_pub_key"].(string), in["coords"].(string), nocache)
+ var box_pub_key, coords string
+ if in["box_pub_key"] == nil && in["coords"] == nil {
+ nodeinfo := []byte(a.core.nodeinfo.getNodeInfo())
+ var jsoninfo interface{}
+ if err := json.Unmarshal(nodeinfo, &jsoninfo); err != nil {
+ return admin_info{}, err
+ } else {
+ return admin_info{"nodeinfo": jsoninfo}, nil
+ }
+ } else if in["box_pub_key"] == nil || in["coords"] == nil {
+ return admin_info{}, errors.New("Expecting both box_pub_key and coords")
+ } else {
+ box_pub_key = in["box_pub_key"].(string)
+ coords = in["coords"].(string)
+ }
+ result, err := a.admin_getNodeInfo(box_pub_key, coords, nocache)
if err == nil {
var m map[string]interface{}
if err = json.Unmarshal(result, &m); err == nil {
diff --git a/src/yggdrasil/awdl.go b/src/yggdrasil/awdl.go
new file mode 100644
index 00000000..633d5f9c
--- /dev/null
+++ b/src/yggdrasil/awdl.go
@@ -0,0 +1,148 @@
+package yggdrasil
+
+import (
+ "errors"
+ "fmt"
+ "sync"
+ "sync/atomic"
+ "time"
+
+ "github.com/yggdrasil-network/yggdrasil-go/src/crypto"
+ "github.com/yggdrasil-network/yggdrasil-go/src/util"
+)
+
+type awdl struct {
+ core *Core
+ mutex sync.RWMutex // protects interfaces below
+ interfaces map[string]*awdlInterface
+}
+
+type awdlInterface struct {
+ awdl *awdl
+ fromAWDL chan []byte
+ toAWDL chan []byte
+ shutdown chan bool
+ peer *peer
+}
+
+func (l *awdl) init(c *Core) error {
+ l.core = c
+ l.mutex.Lock()
+ l.interfaces = make(map[string]*awdlInterface)
+ l.mutex.Unlock()
+
+ return nil
+}
+
+func (l *awdl) create(fromAWDL chan []byte, toAWDL chan []byte /*boxPubKey *crypto.BoxPubKey, sigPubKey *crypto.SigPubKey*/, name string) (*awdlInterface, error) {
+ intf := awdlInterface{
+ awdl: l,
+ fromAWDL: fromAWDL,
+ toAWDL: toAWDL,
+ shutdown: make(chan bool),
+ }
+ l.mutex.Lock()
+ l.interfaces[name] = &intf
+ l.mutex.Unlock()
+ myLinkPub, myLinkPriv := crypto.NewBoxKeys()
+ meta := version_getBaseMetadata()
+ meta.box = l.core.boxPub
+ meta.sig = l.core.sigPub
+ meta.link = *myLinkPub
+ metaBytes := meta.encode()
+ l.core.log.Println("toAWDL <- metaBytes")
+ toAWDL <- metaBytes
+ l.core.log.Println("metaBytes = <-fromAWDL")
+ metaBytes = <-fromAWDL
+ l.core.log.Println("version_metadata{}")
+ meta = version_metadata{}
+ if !meta.decode(metaBytes) || !meta.check() {
+ return nil, errors.New("Metadata decode failure")
+ }
+ l.core.log.Println("version_getBaseMetadata{}")
+ base := version_getBaseMetadata()
+ if meta.ver > base.ver || meta.ver == base.ver && meta.minorVer > base.minorVer {
+ return nil, errors.New("Failed to connect to node: " + name + " version: " + fmt.Sprintf("%d.%d", meta.ver, meta.minorVer))
+ }
+ l.core.log.Println("crypto.GetSharedKey")
+ shared := crypto.GetSharedKey(myLinkPriv, &meta.link)
+ //shared := crypto.GetSharedKey(&l.core.boxPriv, boxPubKey)
+ l.core.log.Println("l.core.peers.newPeer")
+ intf.peer = l.core.peers.newPeer(&meta.box, &meta.sig, shared, name)
+ if intf.peer != nil {
+ intf.peer.linkOut = make(chan []byte, 1) // protocol traffic
+ intf.peer.out = func(msg []byte) {
+ defer func() { recover() }()
+ intf.toAWDL <- msg
+ } // called by peer.sendPacket()
+ l.core.switchTable.idleIn <- intf.peer.port // notify switch that we're idle
+ intf.peer.close = func() {
+ close(intf.fromAWDL)
+ close(intf.toAWDL)
+ }
+ go intf.handler()
+ go intf.peer.linkLoop()
+ return &intf, nil
+ }
+ delete(l.interfaces, name)
+ return nil, errors.New("l.core.peers.newPeer failed")
+}
+
+func (l *awdl) getInterface(identity string) *awdlInterface {
+ l.mutex.RLock()
+ defer l.mutex.RUnlock()
+ if intf, ok := l.interfaces[identity]; ok {
+ return intf
+ }
+ return nil
+}
+
+func (l *awdl) shutdown(identity string) error {
+ if intf, ok := l.interfaces[identity]; ok {
+ intf.shutdown <- true
+ l.core.peers.removePeer(intf.peer.port)
+ l.mutex.Lock()
+ delete(l.interfaces, identity)
+ l.mutex.Unlock()
+ return nil
+ } else {
+ return errors.New(fmt.Sprintf("Interface '%s' doesn't exist or already shutdown", identity))
+ }
+}
+
+func (ai *awdlInterface) handler() {
+ send := func(msg []byte) {
+ ai.toAWDL <- msg
+ atomic.AddUint64(&ai.peer.bytesSent, uint64(len(msg)))
+ util.PutBytes(msg)
+ }
+ for {
+ timerInterval := tcp_ping_interval
+ timer := time.NewTimer(timerInterval)
+ defer timer.Stop()
+ select {
+ case p := <-ai.peer.linkOut:
+ send(p)
+ continue
+ default:
+ }
+ timer.Stop()
+ select {
+ case <-timer.C:
+ default:
+ }
+ timer.Reset(timerInterval)
+ select {
+ case _ = <-timer.C:
+ send([]byte{})
+ case p := <-ai.peer.linkOut:
+ send(p)
+ continue
+ case r := <-ai.fromAWDL:
+ ai.peer.handlePacket(r)
+ ai.awdl.core.switchTable.idleIn <- ai.peer.port
+ case <-ai.shutdown:
+ return
+ }
+ }
+}
diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go
index 99330e12..a1c2127d 100644
--- a/src/yggdrasil/core.go
+++ b/src/yggdrasil/core.go
@@ -35,6 +35,7 @@ type Core struct {
multicast multicast
nodeinfo nodeinfo
tcp tcpInterface
+ awdl awdl
log *log.Logger
ifceExpr []*regexp.Regexp // the zone of link-local IPv6 peers must match this
}
@@ -125,13 +126,18 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) error {
c.admin.init(c, nc.AdminListen)
c.nodeinfo.init(c)
- c.nodeinfo.setNodeInfo(nc.NodeInfo)
+ c.nodeinfo.setNodeInfo(nc.NodeInfo, nc.NodeInfoPrivacy)
if err := c.tcp.init(c, nc.Listen, nc.ReadTimeout); err != nil {
c.log.Println("Failed to start TCP interface")
return err
}
+ if err := c.awdl.init(c); err != nil {
+ c.log.Println("Failed to start AWDL interface")
+ return err
+ }
+
if nc.SwitchOptions.MaxTotalQueueSize >= SwitchQueueTotalMinSize {
c.switchTable.queueTotalMaxSize = nc.SwitchOptions.MaxTotalQueueSize
}
@@ -248,8 +254,8 @@ func (c *Core) GetNodeInfo() nodeinfoPayload {
}
// Sets the nodeinfo.
-func (c *Core) SetNodeInfo(nodeinfo interface{}) {
- c.nodeinfo.setNodeInfo(nodeinfo)
+func (c *Core) SetNodeInfo(nodeinfo interface{}, nodeinfoprivacy bool) {
+ c.nodeinfo.setNodeInfo(nodeinfo, nodeinfoprivacy)
}
// Sets the output logger of the Yggdrasil node after startup. This may be
diff --git a/src/yggdrasil/dht.go b/src/yggdrasil/dht.go
index af104f51..b52a820b 100644
--- a/src/yggdrasil/dht.go
+++ b/src/yggdrasil/dht.go
@@ -12,7 +12,12 @@ import (
"github.com/yggdrasil-network/yggdrasil-go/src/crypto"
)
-const dht_lookup_size = 16
+const (
+ dht_lookup_size = 16
+ dht_timeout = 6 * time.Minute
+ dht_max_delay = 5 * time.Minute
+ dht_max_delay_dirty = 30 * time.Second
+)
// dhtInfo represents everything we know about a node in the DHT.
// This includes its key, a cache of it's NodeID, coords, and timing/ping related info for deciding who/when to ping nodes for maintenance.
@@ -23,6 +28,7 @@ type dhtInfo struct {
recv time.Time // When we last received a message
pings int // Time out if at least 3 consecutive maintenance pings drop
throttle time.Duration
+ dirty bool // Set to true if we've used this node in ping responses (for queries about someone other than the person doing the asking, i.e. real searches) since the last time we heard from the node
}
// Returns the *NodeID associated with dhtInfo.key, calculating it on the fly the first time or from a cache all subsequent times.
@@ -134,6 +140,16 @@ func (t *dht) insert(info *dhtInfo) {
t.table[*info.getNodeID()] = info
}
+// Insert a peer into the table if it hasn't been pinged lately, to keep peers from dropping
+func (t *dht) insertPeer(info *dhtInfo) {
+ oldInfo, isIn := t.table[*info.getNodeID()]
+ if !isIn || time.Since(oldInfo.recv) > dht_max_delay+30*time.Second {
+ // TODO? also check coords?
+ newInfo := *info // Insert a copy
+ t.insert(&newInfo)
+ }
+}
+
// Return true if first/second/third are (partially) ordered correctly.
func dht_ordered(first, second, third *crypto.NodeID) bool {
lessOrEqual := func(first, second *crypto.NodeID) bool {
@@ -185,6 +201,14 @@ func (t *dht) handleReq(req *dhtReq) {
if _, isIn := t.table[*info.getNodeID()]; !isIn && t.isImportant(&info) {
t.ping(&info, nil)
}
+ // Maybe mark nodes from lookup as dirty
+ if req.Dest != *info.getNodeID() {
+ // This node asked about someone other than themself, so this wasn't just idle traffic.
+ for _, info := range res.Infos {
+ // Mark nodes dirty so we're sure to check up on them again later
+ info.dirty = true
+ }
+ }
}
// Sends a lookup response to the specified node.
@@ -302,19 +326,32 @@ func (t *dht) doMaintenance() {
}
t.callbacks = newCallbacks
for infoID, info := range t.table {
- if now.Sub(info.recv) > time.Minute || info.pings > 3 {
+ switch {
+ case info.pings > 6:
+ // It failed to respond to too many pings
+ fallthrough
+ case now.Sub(info.recv) > dht_timeout:
+ // It's too old
+ fallthrough
+ case info.dirty && now.Sub(info.recv) > dht_max_delay_dirty && !t.isImportant(info):
+ // We won't ping it to refresh it, so just drop it
delete(t.table, infoID)
t.imp = nil
}
}
for _, info := range t.getImportant() {
- if now.Sub(info.recv) > info.throttle {
+ switch {
+ case now.Sub(info.recv) > info.throttle:
+ info.throttle *= 2
+ if info.throttle < time.Second {
+ info.throttle = time.Second
+ } else if info.throttle > dht_max_delay {
+ info.throttle = dht_max_delay
+ }
+ fallthrough
+ case info.dirty && now.Sub(info.recv) > dht_max_delay_dirty:
t.ping(info, nil)
info.pings++
- info.throttle += time.Second
- if info.throttle > 30*time.Second {
- info.throttle = 30 * time.Second
- }
}
}
}
diff --git a/src/yggdrasil/icmpv6.go b/src/yggdrasil/icmpv6.go
index baae3ab4..52ca50c6 100644
--- a/src/yggdrasil/icmpv6.go
+++ b/src/yggdrasil/icmpv6.go
@@ -156,6 +156,9 @@ func (i *icmpv6) parse_packet_tun(datain []byte, datamac *[]byte) ([]byte, error
// Check for a supported message type
switch icmpv6Header.Type {
case ipv6.ICMPTypeNeighborSolicitation:
+ if !i.tun.iface.IsTAP() {
+ return nil, errors.New("Ignoring Neighbor Solicitation in TUN mode")
+ }
response, err := i.handle_ndp(datain[ipv6.HeaderLen:])
if err == nil {
// Create our ICMPv6 response
@@ -173,16 +176,22 @@ func (i *icmpv6) parse_packet_tun(datain []byte, datamac *[]byte) ([]byte, error
return nil, err
}
case ipv6.ICMPTypeNeighborAdvertisement:
+ if !i.tun.iface.IsTAP() {
+ return nil, errors.New("Ignoring Neighbor Advertisement in TUN mode")
+ }
if datamac != nil {
var addr address.Address
+ var target address.Address
var mac macAddress
copy(addr[:], ipv6Header.Src[:])
+ copy(target[:], datain[48:64])
copy(mac[:], (*datamac)[:])
- neighbor := i.peermacs[addr]
+ // i.tun.core.log.Printf("Learning peer MAC %x for %x\n", mac, target)
+ neighbor := i.peermacs[target]
neighbor.mac = mac
neighbor.learned = true
neighbor.lastadvertisement = time.Now()
- i.peermacs[addr] = neighbor
+ i.peermacs[target] = neighbor
}
return nil, errors.New("No response needed")
}
diff --git a/src/yggdrasil/mobile.go b/src/yggdrasil/mobile.go
new file mode 100644
index 00000000..2ffeffb9
--- /dev/null
+++ b/src/yggdrasil/mobile.go
@@ -0,0 +1,143 @@
+// +build mobile
+
+package yggdrasil
+
+import (
+ "encoding/hex"
+ "encoding/json"
+ "log"
+ "os"
+ "regexp"
+ "time"
+
+ 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(true)
+ 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}
+ }
+ ifceExpr, err := regexp.Compile(".*")
+ if err == nil {
+ c.ifceExpr = append(c.ifceExpr, ifceExpr)
+ }
+ 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(false)
+ 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"
+ //c.log.Println(nc.MulticastInterfaces)
+ for _, ll := range nc.MulticastInterfaces {
+ //c.log.Println("Processing MC", ll)
+ ifceExpr, err := regexp.Compile(ll)
+ if err != nil {
+ panic(err)
+ }
+ c.AddMulticastInterfaceExpr(ifceExpr)
+ }
+ 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(false)
+ 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.GetAddress().String()
+}
+
+// Gets the node's IPv6 subnet in CIDR notation.
+func (c *Core) GetSubnetString() string {
+ return c.GetSubnet().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.tun.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.tun.send <- packet
+ return nil
+}
diff --git a/src/yggdrasil/mobile_android.go b/src/yggdrasil/mobile_android.go
new file mode 100644
index 00000000..24764840
--- /dev/null
+++ b/src/yggdrasil/mobile_android.go
@@ -0,0 +1,12 @@
+// +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
+}
diff --git a/src/yggdrasil/mobile_ios.go b/src/yggdrasil/mobile_ios.go
new file mode 100644
index 00000000..72920fe0
--- /dev/null
+++ b/src/yggdrasil/mobile_ios.go
@@ -0,0 +1,68 @@
+// +build mobile,darwin
+
+package yggdrasil
+
+/*
+#cgo CFLAGS: -x objective-c
+#cgo LDFLAGS: -framework Foundation
+#import
+void Log(const char *text) {
+ NSString *nss = [NSString stringWithUTF8String:text];
+ NSLog(@"%@", nss);
+}
+*/
+import "C"
+import (
+ "errors"
+ "unsafe"
+
+ "github.com/yggdrasil-network/yggdrasil-go/src/util"
+)
+
+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 string) error {
+ fromAWDL := make(chan []byte, 32)
+ toAWDL := make(chan []byte, 32)
+
+ if intf, err := c.awdl.create(fromAWDL, toAWDL, name); err == nil {
+ if intf != nil {
+ c.log.Println(err)
+ return err
+ } else {
+ c.log.Println("c.awdl.create didn't return an interface")
+ return errors.New("c.awdl.create didn't return an interface")
+ }
+ } else {
+ c.log.Println(err)
+ return err
+ }
+}
+
+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.toAWDL, 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.awdl.getInterface(identity); intf != nil {
+ intf.fromAWDL <- packet
+ return nil
+ }
+ return errors.New("AWDLSendPacket identity not known: " + identity)
+}
diff --git a/src/yggdrasil/multicast.go b/src/yggdrasil/multicast.go
index 749dfcdb..c0a676a8 100644
--- a/src/yggdrasil/multicast.go
+++ b/src/yggdrasil/multicast.go
@@ -157,6 +157,6 @@ func (m *multicast) listen() {
}
addr.Zone = from.Zone
saddr := addr.String()
- m.core.tcp.connect(saddr, "")
+ m.core.tcp.connect(saddr, addr.Zone)
}
}
diff --git a/src/yggdrasil/multicast_darwin.go b/src/yggdrasil/multicast_darwin.go
new file mode 100644
index 00000000..71eecce4
--- /dev/null
+++ b/src/yggdrasil/multicast_darwin.go
@@ -0,0 +1,28 @@
+// +build darwin
+
+package yggdrasil
+
+import "syscall"
+import "golang.org/x/sys/unix"
+
+func multicastReuse(network string, address string, c syscall.RawConn) error {
+ var control error
+ var reuseport error
+ var recvanyif error
+
+ control = c.Control(func(fd uintptr) {
+ reuseport = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
+
+ // sys/socket.h: #define SO_RECV_ANYIF 0x1104
+ recvanyif = unix.SetsockoptInt(int(fd), syscall.SOL_SOCKET, 0x1104, 1)
+ })
+
+ switch {
+ case reuseport != nil:
+ return reuseport
+ case recvanyif != nil:
+ return recvanyif
+ default:
+ return control
+ }
+}
diff --git a/src/yggdrasil/multicast_unix.go b/src/yggdrasil/multicast_unix.go
index 9c6d1f11..54bbc645 100644
--- a/src/yggdrasil/multicast_unix.go
+++ b/src/yggdrasil/multicast_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin netbsd freebsd openbsd dragonflybsd
+// +build linux netbsd freebsd openbsd dragonflybsd
package yggdrasil
diff --git a/src/yggdrasil/nodeinfo.go b/src/yggdrasil/nodeinfo.go
index f525beca..b9076328 100644
--- a/src/yggdrasil/nodeinfo.go
+++ b/src/yggdrasil/nodeinfo.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"runtime"
+ "strings"
"sync"
"time"
@@ -96,18 +97,27 @@ func (m *nodeinfo) getNodeInfo() nodeinfoPayload {
}
// Set the current node's nodeinfo
-func (m *nodeinfo) setNodeInfo(given interface{}) error {
+func (m *nodeinfo) setNodeInfo(given interface{}, privacy bool) error {
m.myNodeInfoMutex.Lock()
defer m.myNodeInfoMutex.Unlock()
- newnodeinfo := map[string]interface{}{
+ defaults := map[string]interface{}{
"buildname": GetBuildName(),
"buildversion": GetBuildVersion(),
"buildplatform": runtime.GOOS,
"buildarch": runtime.GOARCH,
}
+ newnodeinfo := make(map[string]interface{})
+ if !privacy {
+ for k, v := range defaults {
+ newnodeinfo[k] = v
+ }
+ }
if nodeinfomap, ok := given.(map[string]interface{}); ok {
for key, value := range nodeinfomap {
- if _, ok := newnodeinfo[key]; ok {
+ if _, ok := defaults[key]; ok {
+ if strvalue, strok := value.(string); strok && strings.EqualFold(strvalue, "null") || value == nil {
+ delete(newnodeinfo, key)
+ }
continue
}
newnodeinfo[key] = value
diff --git a/src/yggdrasil/peer.go b/src/yggdrasil/peer.go
index a2b94b67..333561e5 100644
--- a/src/yggdrasil/peer.go
+++ b/src/yggdrasil/peer.go
@@ -217,6 +217,7 @@ func (p *peer) handlePacket(packet []byte) {
default:
util.PutBytes(packet)
}
+ return
}
// Called to handle traffic or protocolTraffic packets.
diff --git a/src/yggdrasil/router.go b/src/yggdrasil/router.go
index 6c928696..87da8829 100644
--- a/src/yggdrasil/router.go
+++ b/src/yggdrasil/router.go
@@ -110,12 +110,7 @@ func (r *router) mainLoop() {
case p := <-r.send:
r.sendPacket(p)
case info := <-r.core.dht.peers:
- now := time.Now()
- oldInfo, isIn := r.core.dht.table[*info.getNodeID()]
- r.core.dht.insert(info)
- if isIn && now.Sub(oldInfo.recv) < 45*time.Second {
- info.recv = oldInfo.recv
- }
+ r.core.dht.insertPeer(info)
case <-r.reset:
r.core.sessions.resetInits()
r.core.dht.reset()
diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
index 6d923440..8d8fee34 100644
--- a/src/yggdrasil/tcp.go
+++ b/src/yggdrasil/tcp.go
@@ -15,6 +15,7 @@ package yggdrasil
// See version.go for version metadata format
import (
+ "context"
"errors"
"fmt"
"io"
@@ -88,7 +89,11 @@ func (iface *tcpInterface) init(core *Core, addr string, readTimeout int32) (err
iface.tcp_timeout = default_tcp_timeout
}
- iface.serv, err = net.Listen("tcp", addr)
+ ctx := context.Background()
+ lc := net.ListenConfig{
+ Control: iface.tcpContext,
+ }
+ iface.serv, err = lc.Listen(ctx, "tcp", addr)
if err == nil {
iface.calls = make(map[string]struct{})
iface.conns = make(map[tcpInfo](chan struct{}))
@@ -164,7 +169,9 @@ func (iface *tcpInterface) call(saddr string, socksaddr *string, sintf string) {
},
}
} else {
- dialer := net.Dialer{}
+ dialer := net.Dialer{
+ Control: iface.tcpContext,
+ }
if sintf != "" {
ief, err := net.InterfaceByName(sintf)
if err != nil {
diff --git a/src/yggdrasil/tcp_darwin.go b/src/yggdrasil/tcp_darwin.go
new file mode 100644
index 00000000..6483ef86
--- /dev/null
+++ b/src/yggdrasil/tcp_darwin.go
@@ -0,0 +1,28 @@
+// +build darwin
+
+package yggdrasil
+
+import (
+ "syscall"
+
+ "golang.org/x/sys/unix"
+)
+
+// WARNING: This context is used both by net.Dialer and net.Listen in tcp.go
+
+func (iface *tcpInterface) tcpContext(network, address string, c syscall.RawConn) error {
+ var control error
+ var recvanyif error
+
+ control = c.Control(func(fd uintptr) {
+ // sys/socket.h: #define SO_RECV_ANYIF 0x1104
+ recvanyif = unix.SetsockoptInt(int(fd), syscall.SOL_SOCKET, 0x1104, 1)
+ })
+
+ switch {
+ case recvanyif != nil:
+ return recvanyif
+ default:
+ return control
+ }
+}
diff --git a/src/yggdrasil/tcp_other.go b/src/yggdrasil/tcp_other.go
new file mode 100644
index 00000000..5d62b530
--- /dev/null
+++ b/src/yggdrasil/tcp_other.go
@@ -0,0 +1,13 @@
+// +build !darwin
+
+package yggdrasil
+
+import (
+ "syscall"
+)
+
+// WARNING: This context is used both by net.Dialer and net.Listen in tcp.go
+
+func (iface *tcpInterface) tcpContext(network, address string, c syscall.RawConn) error {
+ return nil
+}
diff --git a/src/yggdrasil/tun.go b/src/yggdrasil/tun.go
index b6bc9132..8c0f91d5 100644
--- a/src/yggdrasil/tun.go
+++ b/src/yggdrasil/tun.go
@@ -47,11 +47,13 @@ func (tun *tunAdapter) init(core *Core, send chan<- []byte, recv <-chan []byte)
// Starts the setup process for the TUN/TAP adapter, and if successful, starts
// the read/write goroutines to handle packets on that interface.
func (tun *tunAdapter) start(ifname string, iftapmode bool, addr string, mtu int) error {
- if ifname == "none" {
- return nil
+ if ifname != "none" {
+ if err := tun.setup(ifname, iftapmode, addr, mtu); err != nil {
+ return err
+ }
}
- if err := tun.setup(ifname, iftapmode, addr, mtu); err != nil {
- return err
+ if ifname == "none" || ifname == "dummy" {
+ return nil
}
tun.mutex.Lock()
tun.isOpen = true
@@ -214,11 +216,12 @@ func (tun *tunAdapter) read() error {
continue
}
if buf[o+6] == 58 {
- // Found an ICMPv6 packet
- b := make([]byte, n)
- copy(b, buf)
- // tun.icmpv6.recv <- b
- go tun.icmpv6.parse_packet(b)
+ if tun.iface.IsTAP() {
+ // Found an ICMPv6 packet
+ b := make([]byte, n)
+ copy(b, buf)
+ go tun.icmpv6.parse_packet(b)
+ }
}
packet := append(util.GetBytes(), buf[o:n]...)
tun.send <- packet
diff --git a/src/yggdrasil/tun_darwin.go b/src/yggdrasil/tun_darwin.go
index 943468e6..828c01ea 100644
--- a/src/yggdrasil/tun_darwin.go
+++ b/src/yggdrasil/tun_darwin.go
@@ -1,3 +1,5 @@
+// +build !mobile
+
package yggdrasil
// The darwin platform specific tun parts
diff --git a/src/yggdrasil/tun_dummy.go b/src/yggdrasil/tun_dummy.go
new file mode 100644
index 00000000..234ab1de
--- /dev/null
+++ b/src/yggdrasil/tun_dummy.go
@@ -0,0 +1,19 @@
+// +build mobile
+
+package yggdrasil
+
+// This is to catch unsupported platforms
+// If your platform supports tun devices, you could try configuring it manually
+
+// Creates the TUN/TAP adapter, if supported by the Water library. Note that
+// no guarantees are made at this point on an unsupported platform.
+func (tun *tunAdapter) setup(ifname string, iftapmode bool, addr string, mtu int) error {
+ tun.mtu = getSupportedMTU(mtu)
+ return tun.setupAddress(addr)
+}
+
+// We don't know how to set the IPv6 address on an unknown platform, therefore
+// write about it to stdout and don't try to do anything further.
+func (tun *tunAdapter) setupAddress(addr string) error {
+ return nil
+}
diff --git a/src/yggdrasil/tun_linux.go b/src/yggdrasil/tun_linux.go
index 7a7c9cb7..8ccdd30b 100644
--- a/src/yggdrasil/tun_linux.go
+++ b/src/yggdrasil/tun_linux.go
@@ -1,3 +1,5 @@
+// +build !mobile
+
package yggdrasil
// The linux platform specific tun parts
diff --git a/src/yggdrasil/tun_other.go b/src/yggdrasil/tun_other.go
index 625f9cd5..22058c11 100644
--- a/src/yggdrasil/tun_other.go
+++ b/src/yggdrasil/tun_other.go
@@ -1,4 +1,4 @@
-// +build !linux,!darwin,!windows,!openbsd,!freebsd,!netbsd
+// +build !linux,!darwin,!windows,!openbsd,!freebsd,!netbsd,!mobile
package yggdrasil
diff --git a/src/yggdrasil/wire.go b/src/yggdrasil/wire.go
index 782af433..8891f1ab 100644
--- a/src/yggdrasil/wire.go
+++ b/src/yggdrasil/wire.go
@@ -70,7 +70,7 @@ func wire_decode_uint64(bs []byte) (uint64, int) {
// Converts an int64 into uint64 so it can be written to the wire.
// Non-negative integers are mapped to even integers: 0 -> 0, 1 -> 2, etc.
-// Negative integres are mapped to odd integes: -1 -> 1, -2 -> 3, etc.
+// Negative integers are mapped to odd integers: -1 -> 1, -2 -> 3, etc.
// This means the least significant bit is a sign bit.
func wire_intToUint(i int64) uint64 {
return ((uint64(-(i+1))<<1)|0x01)*(uint64(i)>>63) + (uint64(i)<<1)*(^uint64(i)>>63)