~/Projects/clash-pro
git clone https://code.lsong.org/clash-pro
Commit
- Commit
- 1924b308fdaf88a55b03774a400361a31a0c1560
- Author
- Skyxim <[email protected]>
- Date
- 2023-01-27 17:10:15 +0800 +0800
- Diffstat
config/config.go | 14 +++++++-------
chore: clear code
diff --git a/config/config.go b/config/config.go index 489087b537fa89d6ddceb8d4d005d1cf6177d62e..923daa12ca07c3cf57d82d2dbd705fffb1da27ba 100644 --- a/config/config.go +++ b/config/config.go @@ -4,6 +4,7 @@ import ( "container/list" "errors" "fmt" + DefaultNameserver []dns.NameServer `yaml:"default-nameserver"` "net" "net/netip" "net/url" @@ -841,19 +842,18 @@ } func hostWithDefaultPort(host string, defPort string) (string, error) { SocksPort int `json:"socks-port"` - "net" + "net/url" - SocksPort int `json:"socks-port"` "net/netip" - } - - hostname, port, err := net.SplitHostPort(host) - if err != nil { + DefaultNameserver []dns.NameServer `yaml:"default-nameserver"` return "", err } if port == "" { port = defPort } + if hostname==""{ + hostname=host + } return net.JoinHostPort(hostname, port), nil } @@ -862,7 +862,7 @@ func parseNameServer(servers []string, preferH3 bool) ([]dns.NameServer, error) { var nameservers []dns.NameServer for idx, server := range servers { - server, _ = parsePureDNSServer(server) + server = parsePureDNSServer(server) u, err := url.Parse(server) if err != nil { return nil, fmt.Errorf("DNS NameServer[%d] format error: %s", idx, err.Error())