chore: clear code

This commit is contained in:
gVisor bot 2023-01-27 17:10:15 +08:00
parent f64f1b787f
commit b2c7c989e0

View file

@ -840,18 +840,17 @@ func parseHosts(cfg *RawConfig) (*trie.DomainTrie[netip.Addr], error) {
} }
func hostWithDefaultPort(host string, defPort string) (string, error) { func hostWithDefaultPort(host string, defPort string) (string, error) {
if !strings.Contains(host, ":") {
host += ":"
}
hostname, port, err := net.SplitHostPort(host) hostname, port, err := net.SplitHostPort(host)
if err != nil { if err != nil&&!strings.Contains(err.Error(),"missing port in address") {
return "", err return "", err
} }
if port == "" { if port == "" {
port = defPort port = defPort
} }
if hostname==""{
hostname=host
}
return net.JoinHostPort(hostname, port), nil return net.JoinHostPort(hostname, port), nil
} }
@ -860,7 +859,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 {
server, _ = parsePureDNSServer(server) server = parsePureDNSServer(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())