From 1796000b05abffc60c89435f7c1ccef7815cdb63 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 25 Sep 2018 16:55:57 +0100 Subject: [PATCH] Change to InterfacePeers instead of modifying the tcp:// URI format --- src/yggdrasil/admin.go | 14 ++++++-------- src/yggdrasil/config/config.go | 27 ++++++++++++++------------- src/yggdrasil/core.go | 4 ++-- yggdrasil.go | 13 ++++++++++--- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/yggdrasil/admin.go b/src/yggdrasil/admin.go index f9cb703..8c4944a 100644 --- a/src/yggdrasil/admin.go +++ b/src/yggdrasil/admin.go @@ -112,17 +112,19 @@ func (a *admin) init(c *Core, listenaddr string) { } return admin_info{"sessions": sessions}, nil }) - a.addHandler("addPeer", []string{"uri"}, func(in admin_info) (admin_info, error) { - if a.addPeer(in["uri"].(string)) == nil { + a.addHandler("addPeer", []string{"uri", "[interface]"}, func(in admin_info) (admin_info, error) { + if a.addPeer(in["uri"].(string), in["interface"].(string)) == nil { return admin_info{ "added": []string{ in["uri"].(string), + in["interface"].(string), }, }, nil } else { return admin_info{ "not_added": []string{ in["uri"].(string), + in["interface"].(string), }, }, errors.New("Failed to add peer") } @@ -390,16 +392,12 @@ func (a *admin) printInfos(infos []admin_nodeInfo) string { } // addPeer triggers a connection attempt to a node. -func (a *admin) addPeer(addr string) error { +func (a *admin) addPeer(addr string, sintf string) error { u, err := url.Parse(addr) if err == nil { switch strings.ToLower(u.Scheme) { case "tcp": - if len(u.Path) > 1 { - a.core.tcp.connect(u.Host, u.Path[1:]) - } else { - a.core.tcp.connect(u.Host, "") - } + a.core.tcp.connect(u.Host, sintf) case "socks": a.core.tcp.connectSOCKS(u.Host, u.Path[1:]) default: diff --git a/src/yggdrasil/config/config.go b/src/yggdrasil/config/config.go index 2498193..8c23c62 100644 --- a/src/yggdrasil/config/config.go +++ b/src/yggdrasil/config/config.go @@ -2,19 +2,20 @@ package config // 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."` - AdminListen string `comment:"Listen address for admin connections Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X."` - Peers []string `comment:"List of connection strings for static peers in URI format, i.e.\ntcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j"` - ReadTimeout int32 `comment:"Read timeout for connections, specified in milliseconds. If less than 6000 and not negative, 6000 (the default) is used. If negative, reads won't time out."` - AllowedEncryptionPublicKeys []string `comment:"List of peer encryption public keys to allow or incoming TCP\nconnections from. If left empty/undefined then all connections\nwill be allowed by default."` - EncryptionPublicKey string `comment:"Your public encryption key. Your peers may ask you for this to put\ninto their AllowedEncryptionPublicKeys configuration."` - EncryptionPrivateKey string `comment:"Your private encryption key. DO NOT share this with anyone!"` - SigningPublicKey string `comment:"Your public signing key. You should not ordinarily need to share\nthis with anyone."` - SigningPrivateKey string `comment:"Your private signing key. DO NOT share this with anyone!"` - MulticastInterfaces []string `comment:"Regular expressions for which interfaces multicast peer discovery\nshould be enabled on. If none specified, multicast peer discovery is\ndisabled. The default value is .* which uses all interfaces."` - IfName string `comment:"Local network interface name for TUN/TAP adapter, or \"auto\" to select\nan interface automatically, or \"none\" to run without TUN/TAP."` - IfTAPMode bool `comment:"Set local network interface to TAP mode rather than TUN mode if\nsupported by your platform - option will be ignored if not."` - IfMTU int `comment:"Maximux Transmission Unit (MTU) size for your local TUN/TAP interface.\nDefault is the largest supported size for your platform. The lowest\npossible value is 1280."` + Listen string `comment:"Listen address for peer connections. Default is to listen for all\nTCP connections over IPv4 and IPv6 with a random port."` + AdminListen string `comment:"Listen address for admin connections Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X."` + Peers []string `comment:"List of connection strings for static peers in URI format, i.e.\ntcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j"` + InterfacePeers map[string][]string `comment:"List of connection strings for static peers in URI format, arranged\nby source interface, i.e. { \"eth0\": [ tcp://a.b.c.d:e ] }"` + ReadTimeout int32 `comment:"Read timeout for connections, specified in milliseconds. If less\nthan 6000 and not negative, 6000 (the default) is used. If negative,\nreads won't time out."` + AllowedEncryptionPublicKeys []string `comment:"List of peer encryption public keys to allow or incoming TCP\nconnections from. If left empty/undefined then all connections\nwill be allowed by default."` + EncryptionPublicKey string `comment:"Your public encryption key. Your peers may ask you for this to put\ninto their AllowedEncryptionPublicKeys configuration."` + EncryptionPrivateKey string `comment:"Your private encryption key. DO NOT share this with anyone!"` + SigningPublicKey string `comment:"Your public signing key. You should not ordinarily need to share\nthis with anyone."` + SigningPrivateKey string `comment:"Your private signing key. DO NOT share this with anyone!"` + MulticastInterfaces []string `comment:"Regular expressions for which interfaces multicast peer discovery\nshould be enabled on. If none specified, multicast peer discovery is\ndisabled. The default value is .* which uses all interfaces."` + IfName string `comment:"Local network interface name for TUN/TAP adapter, or \"auto\" to select\nan interface automatically, or \"none\" to run without TUN/TAP."` + IfTAPMode bool `comment:"Set local network interface to TAP mode rather than TUN mode if\nsupported by your platform - option will be ignored if not."` + IfMTU int `comment:"Maximux Transmission Unit (MTU) size for your local TUN/TAP interface.\nDefault is the largest supported size for your platform. The lowest\npossible value is 1280."` //Net NetConfig `comment:"Extended options for connecting to peers over other networks."` } diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go index 35ba2ce..224bad9 100644 --- a/src/yggdrasil/core.go +++ b/src/yggdrasil/core.go @@ -182,8 +182,8 @@ func (c *Core) SetLogger(log *log.Logger) { // Adds a peer. This should be specified in the peer URI format, i.e. // tcp://a.b.c.d:e, udp://a.b.c.d:e, socks://a.b.c.d:e/f.g.h.i:j -func (c *Core) AddPeer(addr string) error { - return c.admin.addPeer(addr) +func (c *Core) AddPeer(addr string, sintf string) error { + return c.admin.addPeer(addr, sintf) } // Adds an expression to select multicast interfaces for peer discovery. This diff --git a/yggdrasil.go b/yggdrasil.go index ab237f4..7102824 100644 --- a/yggdrasil.go +++ b/yggdrasil.go @@ -60,6 +60,7 @@ func generateConfig(isAutoconf bool) *nodeConfig { 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 @@ -231,14 +232,20 @@ func main() { // configure them. The loop ensures that disconnected peers will eventually // be reconnected with. go func() { - if len(cfg.Peers) == 0 { + if len(cfg.Peers) == 0 && len(cfg.InterfacePeers) == 0 { return } for { - for _, p := range cfg.Peers { - n.core.AddPeer(p) + for _, peer := range cfg.Peers { + n.core.AddPeer(peer, "") time.Sleep(time.Second) } + for intf, intfpeers := range cfg.InterfacePeers { + for _, peer := range intfpeers { + n.core.AddPeer(peer, intf) + time.Sleep(time.Second) + } + } time.Sleep(time.Minute) } }()