mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-14 03:20:28 +00:00
don't allow ygg tcp connections to/from a local ygg address
This commit is contained in:
parent
45810fa184
commit
8345ae1fa3
@ -25,6 +25,7 @@ import (
|
|||||||
|
|
||||||
"golang.org/x/net/proxy"
|
"golang.org/x/net/proxy"
|
||||||
|
|
||||||
|
"github.com/yggdrasil-network/yggdrasil-go/src/address"
|
||||||
"github.com/yggdrasil-network/yggdrasil-go/src/util"
|
"github.com/yggdrasil-network/yggdrasil-go/src/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -397,6 +398,18 @@ func (t *tcp) handler(sock net.Conn, incoming bool, options tcpOptions) {
|
|||||||
local, _, _ = net.SplitHostPort(sock.LocalAddr().String())
|
local, _, _ = net.SplitHostPort(sock.LocalAddr().String())
|
||||||
remote, _, _ = net.SplitHostPort(sock.RemoteAddr().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
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
force := net.ParseIP(strings.Split(remote, "%")[0]).IsLinkLocalUnicast()
|
force := net.ParseIP(strings.Split(remote, "%")[0]).IsLinkLocalUnicast()
|
||||||
link, err := t.link.core.link.create(&stream, name, proto, local, remote, incoming, force, options.linkOptions)
|
link, err := t.link.core.link.create(&stream, name, proto, local, remote, incoming, force, options.linkOptions)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user