purgatory/Clash.Meta
1
0
Fork 0
mirror of https://github.com/MetaCubeX/Clash.Meta.git synced 2025-04-18 08:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

resolve ip for sniffed domain

Browse source
This commit is contained in:
mryanl 2025-01-21 12:31:14 -05:00
parent 1c5f4a3ab1
commit be7974823a
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
constant/metadata.go
View file

@ -156,7 +156,8 @@ type Metadata struct {
RawSrcAddr net.Addr `json:"-"`
RawDstAddr net.Addr `json:"-"`
// Only domain rule
SniffHost string `json:"sniffHost"`
SniffHost string `json:"sniffHost"`
SniffDstIP netip.Addr `json:"sniffDestinationIP"`
}
func (m *Metadata) RemoteAddress() string {

9
rules/common/ipcidr.go
View file

@ -37,10 +37,17 @@ func (i *IPCIDR) RuleType() C.RuleType {
func (i *IPCIDR) Match(metadata *C.Metadata) (bool, string) {
ip := metadata.DstIP
var ipsValid bool = true
ips := metadata.SniffDstIP
if ips.IsValid() {
ipsValid = i.ipnet.Contains(ips.WithZone(""))
}
if i.isSourceIP {
ip = metadata.SrcIP
}
return ip.IsValid() && i.ipnet.Contains(ip.WithZone("")), i.adapter
return ip.IsValid() && i.ipnet.Contains(ip.WithZone("")) && ipsValid, i.adapter
}
func (i *IPCIDR) Adapter() string {

14
tunnel/tunnel.go
View file

@ -619,6 +619,20 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
}()
}
if metadata.SniffHost != "" && !metadata.SniffDstIP.IsValid() && rule.ShouldResolveIP() {
func() {
ctx, cancel := context.WithTimeout(context.Background(), resolver.DefaultDNSTimeout)
defer cancel()
ip, err := resolver.ResolveIP(ctx, metadata.SniffHost)
if err != nil {
log.Debugln("[DNS] resolve sniffed host %s error: %s", metadata.SniffHost, err.Error())
} else {
log.Debugln("[DNS] sniffed %s --> %s", metadata.SniffHost, ip.String())
metadata.SniffDstIP = ip
}
}()
}
if attemptProcessLookup && !findProcessMode.Off() && (findProcessMode.Always() || rule.ShouldFindProcess()) {
attemptProcessLookup = false
if !features.CMFA {