fumiama/terasu
1
0
Fork 0
mirror of https://github.com/fumiama/terasu.git synced 2026-06-22 21:50:27 +08:00
Code Activity

chore: make lint happy

Browse Source
This commit is contained in:
源文雨
2025-10-23 23:38:06 +08:00
parent bda0c8de97
commit 4df0e33986
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dns/dns.go
View File

@@ -81,16 +81,16 @@ func (ds *dnsstat) disable(reEnable time.Duration) {
})
}
// DNSList is a bundle of DNSs
type DNSList struct {
// List is a bundle of DNSs
type List struct {
sync.RWMutex
hostseq []string
m map[string][]*dnsstat
b map[string][]string
}
// DNSConfig is the user config
type DNSConfig struct {
// Config is the user config
type Config struct {
Servers map[string][]string `yaml:"Servers"` // Servers map[dot.com]ip:ports
Fallbacks map[string][]string `yaml:"Fallbacks"` // Fallbacks map[domain]ips
}
@@ -111,7 +111,7 @@ func hasfallback(lst []string, a string) bool {
}
// Add ...
func (ds *DNSList) Add(c *DNSConfig) {
func (ds *List) Add(c *Config) {
ds.Lock()
defer ds.Unlock()
addList := map[string][]*dnsstat{}
@@ -147,7 +147,7 @@ func (ds *DNSList) Add(c *DNSConfig) {
}
// rangeHosts in sequence, please use in rlock
func (ds *DNSList) rangeHosts(fn func(host string, addrs []*dnsstat) error) error {
func (ds *List) rangeHosts(fn func(host string, addrs []*dnsstat) error) error {
for _, h := range ds.hostseq {
if err := fn(h, ds.m[h]); err != nil {
return err
@@ -156,7 +156,7 @@ func (ds *DNSList) rangeHosts(fn func(host string, addrs []*dnsstat) error) erro
return nil
}
func (ds *DNSList) lookupHostDoH(ctx context.Context, host string) (hosts []string, err error) {
func (ds *List) lookupHostDoH(ctx context.Context, host string) (hosts []string, err error) {
ds.RLock()
defer ds.RUnlock()
// try to use DoH first
@@ -195,7 +195,7 @@ func (ds *DNSList) lookupHostDoH(ctx context.Context, host string) (hosts []stri
}
// DialContext ...
func (ds *DNSList) DialContext(ctx context.Context, dialer *net.Dialer) (tlsConn *tls.Conn, err error) {
func (ds *List) DialContext(ctx context.Context, dialer *net.Dialer) (tlsConn *tls.Conn, err error) {
err = ErrNoDNSAvailable
if dialer == nil {
@@ -270,7 +270,7 @@ func (ds *DNSList) DialContext(ctx context.Context, dialer *net.Dialer) (tlsConn
}
// IPv6Servers should only be used when IPv6 is available
var IPv6Servers = DNSList{
var IPv6Servers = List{
hostseq: []string{
"dot.sb", "dns.google", "cloudflare-dns.com", "dns.opendns.com", "dns10.quad9.net",
},
@@ -307,7 +307,7 @@ var IPv6Servers = DNSList{
}
// IPv4Servers is the default server set
var IPv4Servers = DNSList{
var IPv4Servers = List{
hostseq: []string{
"dot.sb", "dns.google", "cloudflare-dns.com", "dns.opendns.com", "dns10.quad9.net",
},
@@ -346,7 +346,7 @@ var IPv4Servers = DNSList{
// DefaultResolver ...
var DefaultResolver = &net.Resolver{
PreferGo: true,
Dial: func(ctx context.Context, nw, _ string) (net.Conn, error) {
Dial: func(ctx context.Context, _, _ string) (net.Conn, error) {
if ip.IsIPv6Available {
return IPv6Servers.DialContext(ctx, nil)
}

10
dns/dns_test.go
View File

@@ -77,17 +77,17 @@ func TestBadDNS(t *testing.T) {
IPv4Servers.m = dotv4serversbak
}()
if ip.IsIPv6Available {
IPv6Servers = DNSList{
IPv6Servers = List{
m: map[string][]*dnsstat{},
}
IPv6Servers.Add(&DNSConfig{
IPv6Servers.Add(&Config{
Servers: map[string][]string{"test.bad.host": {"169.254.122.111"}},
})
} else {
IPv4Servers = DNSList{
IPv4Servers = List{
m: map[string][]*dnsstat{},
}
IPv4Servers.Add(&DNSConfig{
IPv4Servers.Add(&Config{
Servers: map[string][]string{"test.bad.host": {"169.254.122.111:853"}},
})
}
@@ -101,7 +101,7 @@ func TestBadDNS(t *testing.T) {
}
}
func (ds *DNSList) test() {
func (ds *List) test() {
ds.RLock()
defer ds.RUnlock()
_ = ds.rangeHosts(func(host string, addrs []*dnsstat) error {