Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-04-24 20:28:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: better parse udp dns

Browse Source
This commit is contained in:
Skyxim 2023-01-27 13:07:52 +08:00
parent 6decaef050
commit 5bcea37d59
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/config.go
View File

@ -860,10 +860,7 @@ func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error)
var nameservers []dns.NameServer var nameservers []dns.NameServer
for idx, server := range servers { for idx, server := range servers {
// parse without scheme .e.g 8.8.8.8:53 server, _ = parsePureDNSServer(server)
if !strings.Contains(server, "://") {
server = "udp://" + server
}
u, err := url.Parse(server) u, err := url.Parse(server)
if err != nil { if err != nil {
return nil, fmt.Errorf("DNS NameServer[%d] format error: %s", idx, err.Error()) return nil, fmt.Errorf("DNS NameServer[%d] format error: %s", idx, err.Error())
@ -939,6 +936,25 @@ func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error)
return nameservers, nil return nameservers, nil
} }
func parsePureDNSServer(server string) (string, bool) {
addPre := func(server string) string {
return "udp://" + server
}
if ip := net.ParseIP(server); ip == nil {
// parse without scheme .e.g 8.8.8.8:53
if strings.Contains(server,"://") {
return server, true
}
if addr, err := net.ResolveUDPAddr("", server); err == nil {
return addPre(addr.String()), true
} else {
return addPre(server), false
}
} else {
return addPre(net.JoinHostPort(ip.String(), "53")), true
}
}
func parseNameServerPolicy(nsPolicy map[string]string, preferH3 bool) (map[string]dns.NameServer, error) { func parseNameServerPolicy(nsPolicy map[string]string, preferH3 bool) (map[string]dns.NameServer, error) {
policy := map[string]dns.NameServer{} policy := map[string]dns.NameServer{}