Correct cache behavior

Fangliding · web-flow · commit 331718b936bb · 2024-09-15T07:31:51.000Z
diff --git a/transport/internet/tls/ech.go b/transport/internet/tls/ech.go
@@ -56,14 +56,17 @@ func QueryRecord(domain string, server string) (string, error) {
 	defer mutex.RUnlock()
 	rec, found := dnsCache[domain]
 	if found && rec.expire.After(time.Now()) {
-		return "", nil
+		return rec.record, nil
 	}
+	mutex.Lock()
+	defer mutex.Unlock()
 	record, err := dohQuery(server, domain)
 	if err != nil {
 		return "", err
 	}
 	rec.record = record
 	rec.expire = time.Now().Add(time.Second * 600)
+	dnsCache[domain] = rec
 	return record, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,14 +56,17 @@ func QueryRecord(domain string, server string) (string, error) {`
`56`	`56`	`defer mutex.RUnlock()`
`57`	`57`	`rec, found := dnsCache[domain]`
`58`	`58`	`if found && rec.expire.After(time.Now()) {`
`59`		`- return "", nil`
	`59`	`+ return rec.record, nil`
`60`	`60`	`}`
	`61`	`+ mutex.Lock()`
	`62`	`+ defer mutex.Unlock()`
`61`	`63`	`record, err := dohQuery(server, domain)`
`62`	`64`	`if err != nil {`
`63`	`65`	`return "", err`
`64`	`66`	`}`
`65`	`67`	`rec.record = record`
`66`	`68`	`rec.expire = time.Now().Add(time.Second * 600)`
	`69`	`+ dnsCache[domain] = rec`
`67`	`70`	`return record, nil`
`68`	`71`	`}`
`69`	`72`