yggdrasil: Ygg-over-ygg bugfix

Signed-off-by: William Fleurant <meshnet@protonmail.com>
(cherry picked from commit 1d78e7dc3157b113f3026ffdacff09a63d18755c)

diff --git a/net/yggdrasil/Makefile b/net/yggdrasil/Makefile
index cad40d7855c2751f0b5c38dd7fa43b9fb9a2c6c5..8fbf7a845db0d18b6c598b90e5af57f95425036d 100644 (file)
--- a/net/yggdrasil/Makefile
+++ b/net/yggdrasil/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=yggdrasil
 PKG_VERSION:=0.3.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/yggdrasil-network/yggdrasil-go/tar.gz/v$(PKG_VERSION)?

diff --git a/net/yggdrasil/patches/100-drop-log-ygg-over-ygg.patch b/net/yggdrasil/patches/100-drop-log-ygg-over-ygg.patch
new file mode 100644 (file)
index 0000000..682e485
--- /dev/null
+++ b/net/yggdrasil/patches/100-drop-log-ygg-over-ygg.patch
@@ -0,0 +1,33 @@
+diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
+index 9cca419..45f93a5 100644
+--- a/src/yggdrasil/tcp.go
++++ b/src/yggdrasil/tcp.go
+@@ -25,6 +25,7 @@ import (
+ 
+       "golang.org/x/net/proxy"
+ 
++      "github.com/yggdrasil-network/yggdrasil-go/src/address"
+       "github.com/yggdrasil-network/yggdrasil-go/src/util"
+ )
+ 
+@@ -386,6 +387,19 @@ func (t *tcp) handler(sock net.Conn, incoming bool, options interface{}, upgrade
+               local, _, _ = net.SplitHostPort(sock.LocalAddr().String())
+               remote, _, _ = net.SplitHostPort(sock.RemoteAddr().String())
+       }
++      localIP := net.ParseIP(local)
++      if localIP = localIP.To16(); localIP != nil {
++              var laddr address.Address
++              var lsubnet address.Subnet
++              copy(laddr[:], localIP)
++              copy(lsubnet[:], localIP)
++              if laddr.IsValid() || lsubnet.IsValid() {
++                      // The local address is with the network address/prefix range
++                      // This would route ygg over ygg, which we don't want
++                      t.link.core.log.Debugln("Dropping ygg-tunneled connection", local, remote)
++                      return
++              }
++      }
+       force := net.ParseIP(strings.Split(remote, "%")[0]).IsLinkLocalUnicast()
+       link, err := t.link.core.link.create(&stream, name, proto, local, remote, incoming, force)
+       if err != nil {
+