KJZH001/nezha-2023
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚸 优化NAT64机器取IP场景

Browse Source
This commit is contained in:
naiba 2021-07-13 10:59:13 +08:00
parent 32cb05e8cd
commit fea7858297
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/agent/monitor/myip.go
View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings"
"time" "time"
"github.com/naiba/nezha/pkg/utils" "github.com/naiba/nezha/pkg/utils"
@ -64,6 +65,14 @@ func fetchGeoIP(servers []string, isV6 bool) geoIP {
if err != nil { if err != nil {
continue continue
} }
// 没取到 v6 IP
if isV6 && !strings.Contains(ip.IP, ":") {
continue
}
// 没取到 v4 IP
if !isV6 && !strings.Contains(ip.IP, ".") {
continue
}
if ip.IP == "" && ip.Query != "" { if ip.IP == "" && ip.Query != "" {
ip.IP = ip.Query ip.IP = ip.Query
} }

8
pkg/utils/http.go
View File

@ -36,7 +36,7 @@ func NewSingleStackHTTPClient(httpTimeout, dialTimeout, keepAliveTimeout time.Du
func resolveIP(addr string, ipv6 bool) (string, error) { func resolveIP(addr string, ipv6 bool) (string, error) {
url := strings.Split(addr, ":") url := strings.Split(addr, ":")
dnsServers := []string{"2606:4700:4700::1001", "2001:4860:4860::8844", "2400:3200::1", "2400:3200:baba::1"} dnsServers := []string{"[2606:4700:4700::1001]", "[2001:4860:4860::8844]", "[2400:3200::1]", "[2400:3200:baba::1]"}
if !ipv6 { if !ipv6 {
dnsServers = []string{"1.0.0.1", "8.8.4.4", "223.5.5.5", "223.6.6.6"} dnsServers = []string{"1.0.0.1", "8.8.4.4", "223.5.5.5", "223.6.6.6"}
} }
@ -44,17 +44,13 @@ func resolveIP(addr string, ipv6 bool) (string, error) {
res, err := net.LookupIP(url[0]) res, err := net.LookupIP(url[0])
if err != nil { if err != nil {
for i := 0; i < len(dnsServers); i++ { for i := 0; i < len(dnsServers); i++ {
dnsServer := dnsServers[i]
if ipv6 {
dnsServer = "[" + dnsServer + "]"
}
r := &net.Resolver{ r := &net.Resolver{
PreferGo: true, PreferGo: true,
Dial: func(ctx context.Context, network, address string) (net.Conn, error) { Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
d := net.Dialer{ d := net.Dialer{
Timeout: time.Second * 10, Timeout: time.Second * 10,
} }
return d.DialContext(ctx, "udp", dnsServer+":53") return d.DialContext(ctx, "udp", dnsServers[i]+":53")
}, },
} }
res, err = r.LookupIP(context.Background(), "ip", url[0]) res, err = r.LookupIP(context.Background(), "ip", url[0])