You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.2 KiB
33 lines
1.2 KiB
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 {
|
|
|