Merge branch 'Alpha' into Meta

config/config.go

@@ -841,7 +841,7 @@ func parseHosts(cfg *RawConfig) (*trie.DomainTrie[resolver.HostValue], error) {
 				} else {
 					ips := make([]netip.Addr, 0)
 					for _, addr := range addrs {
-						if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+						if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback()&&!ipnet.IP.IsLinkLocalUnicast() {
 							if ip, err := netip.ParseAddr(ipnet.IP.String()); err == nil {
 								ips = append(ips, ip)
 							}

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/oschwald/geoip2-golang v1.8.0
 	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97
 	github.com/sagernet/sing v0.2.5-0.20230425211221-a23ffbaeb5b9
-	github.com/sagernet/sing-mux v0.0.0-20230425130511-b0a6ffd8406f
+	github.com/sagernet/sing-mux v0.0.0-20230427141602-9836fc9b052e
 	github.com/sagernet/sing-shadowtls v0.1.2-0.20230417103049-4f682e05f19b
 	github.com/sagernet/sing-vmess v0.1.5-0.20230417103030-8c3070ae3fb3
 	github.com/sagernet/tfo-go v0.0.0-20230303015439-ffcfd8c41cf9

go.sum

@@ -147,8 +147,8 @@ github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2
 github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
 github.com/sagernet/sing v0.2.5-0.20230425211221-a23ffbaeb5b9 h1:kpgKJbhesj6BBLTKIfBCJGQPm2ww7pNxn566C6TrHdA=
 github.com/sagernet/sing v0.2.5-0.20230425211221-a23ffbaeb5b9/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w=
-github.com/sagernet/sing-mux v0.0.0-20230425130511-b0a6ffd8406f h1:iEpOTgBTjt0vZJVXMTqYq13XyIu/337TWbq6WZ3CMWc=
+github.com/sagernet/sing-mux v0.0.0-20230427141602-9836fc9b052e h1:t8nuY9plpHEzlnPxOpuv64jhjz3teIvccu3YMFX4fJI=
-github.com/sagernet/sing-mux v0.0.0-20230425130511-b0a6ffd8406f/go.mod h1:pF+RnLvCAOhECrvauy6LYOpBakJ/vuaF1Wm4lPsWryI=
+github.com/sagernet/sing-mux v0.0.0-20230427141602-9836fc9b052e/go.mod h1:pF+RnLvCAOhECrvauy6LYOpBakJ/vuaF1Wm4lPsWryI=
 github.com/sagernet/sing-shadowtls v0.1.2-0.20230417103049-4f682e05f19b h1:ouW/6IDCrxkBe19YSbdCd7buHix7b+UZ6BM4Zz74XF4=
 github.com/sagernet/sing-shadowtls v0.1.2-0.20230417103049-4f682e05f19b/go.mod h1:oG8bPerYI6cZ74KquY3DvA7ynECyrILPBnce6wtBqeI=
 github.com/sagernet/sing-vmess v0.1.5-0.20230417103030-8c3070ae3fb3 h1:BHOnxrbC929JonuKqFdJ7ZbDp7zs4oTlH5KFvKtWu9U=

tunnel/statistic/manager.go

@@ -61,6 +61,7 @@ func (m *Manager) Now() (up int64, down int64) {
 }
 
 func (m *Manager) Memory() uint64 {
+	m.updateMemory()
 	return m.memory
 }
 
@@ -70,16 +71,6 @@ func (m *Manager) Snapshot() *Snapshot {
 		connections = append(connections, value.(tracker))
 		return true
 	})
-
-	getMem := func() uint64 {
-		stat, err := m.process.MemoryInfo()
-		if err != nil {
-			return 0
-		}
-		return stat.RSS
-	}
-	m.memory = getMem()
-
 	return &Snapshot{
 		UploadTotal:   m.uploadTotal.Load(),
 		DownloadTotal: m.downloadTotal.Load(),
@@ -88,6 +79,14 @@ func (m *Manager) Snapshot() *Snapshot {
 	}
 }
 
+func (m *Manager) updateMemory() {
+	stat, err := m.process.MemoryInfo()
+	if err != nil {
+		return
+	}
+	m.memory = stat.RSS
+}
+
 func (m *Manager) ResetStatistic() {
 	m.uploadTemp.Store(0)
 	m.uploadBlip.Store(0)

tunnel/statistic/tracker.go

@@ -3,6 +3,7 @@ package statistic
 import (
 	"io"
 	"net"
+	"net/netip"
 	"time"
 
 	"github.com/Dreamacro/clash/common/atomic"
@@ -110,13 +111,24 @@ func (tt *tcpTracker) Upstream() any {
 	return tt.Conn
 }
 
+func parseRemoteDestination(addr net.Addr, conn C.Connection) string {
+	if addr == nil && conn != nil {
+		return conn.RemoteDestination()
+	}
+	if addrPort, err := netip.ParseAddrPort(addr.String()); err == nil && addrPort.Addr().IsValid() {
+		return addrPort.Addr().String()
+	} else {
+		if conn != nil {
+			return conn.RemoteDestination()
+		} else {
+			return ""
+		}
+	}
+}
+
 func NewTCPTracker(conn C.Conn, manager *Manager, metadata *C.Metadata, rule C.Rule, uploadTotal int64, downloadTotal int64, pushToManager bool) *tcpTracker {
 	if conn != nil {
-		if tcpAddr, ok := conn.RemoteAddr().(*net.TCPAddr); ok {
+		metadata.RemoteDst = parseRemoteDestination(conn.RemoteAddr(), conn)
-			metadata.RemoteDst = tcpAddr.IP.String()
-		} else {
-			metadata.RemoteDst = conn.RemoteDestination()
-		}
 	}
 
 	t := &tcpTracker{
@@ -190,7 +202,7 @@ func (ut *udpTracker) Close() error {
 }
 
 func NewUDPTracker(conn C.PacketConn, manager *Manager, metadata *C.Metadata, rule C.Rule, uploadTotal int64, downloadTotal int64, pushToManager bool) *udpTracker {
-	metadata.RemoteDst = conn.RemoteDestination()
+	metadata.RemoteDst = parseRemoteDestination(nil, conn)
 
 	ut := &udpTracker{
 		PacketConn: conn,