doh添加超时选项

Author: masx200

README.md

@@ -30,7 +30,7 @@ http3反向代理服务器实验golang
 
 实现了通过A,AAAA,HTTPS,CNAME记录解析域名的功能
 
-优化了负载均衡器的更多配置选项和测试
+优化了负载均衡器的更多配置选项和测试,可选负载均衡算法和服务器被动健康检查和主动健康检查的开关,以及可自定义的故障转移重试条件.
 
 #### 安装教程
 

dns/dns.go

@@ -5,6 +5,7 @@ import (
 	// "time"
 	"context"
 	"errors"
+	"time"
 
 	print_experiment "github.com/masx200/http3-reverse-proxy-server-experiment/print"
 	doq "github.com/tantalor93/doq-go/doq"
@@ -106,15 +107,19 @@ func setPortIfMissing(rawURL string) (string, error) {
 // r: 代表DNS应答消息的dns.Msg对象。
 // err: 如果过程中发生错误，则返回错误信息。
 func DohClient(msg *dns.Msg, dohServerURL string) (r *dns.Msg, err error) {
+	var ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
 	/* 为了doh的缓存,需要设置id为0 ,可以缓存*/
 	msg.Id = 0
 	body, err := msg.Pack()
 	if err != nil {
 		log.Println(dohServerURL, err)
 		return nil, err
 	}
+	req, err := http.NewRequestWithContext(ctx, "POST", dohServerURL, strings.NewReader(string(body)))
+	req.Header.Set("Content-Type", "application/dns-message")
 	//http request doh
-	res, err := http.Post(dohServerURL, "application/dns-message", strings.NewReader(string(body)))
+	res, err := http.DefaultClient.Do(req) //Post(dohServerURL, "application/dns-message", strings.NewReader(string(body)))
 	if err != nil {
 		log.Println(dohServerURL, err)
 		return nil, err

h3/h3.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/masx200/http3-reverse-proxy-server-experiment/adapter"
 	"github.com/miekg/dns"
@@ -165,6 +166,8 @@ func CreateHTTP3TransportWithIPGetter(getter func() (string, error)) adapter.HTT
 // r: 代表DNS应答消息的dns.Msg对象。
 // err: 如果过程中发生错误，则返回错误信息。
 func DoHTTP3Client(msg *dns.Msg, dohttp3ServerURL string) (r *dns.Msg, err error) {
+	var ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
 	/* 为了doh的缓存,需要设置id为0 ,可以缓存*/
 	msg.Id = 0
 	client := &http.Client{
@@ -175,8 +178,10 @@ func DoHTTP3Client(msg *dns.Msg, dohttp3ServerURL string) (r *dns.Msg, err error
 		log.Println(dohttp3ServerURL, err)
 		return nil, err
 	}
+	req, err := http.NewRequestWithContext(ctx, "POST", dohttp3ServerURL, strings.NewReader(string(body)))
+	req.Header.Set("Content-Type", "application/dns-message")
 	//http request doh
-	res, err := client.Post(dohttp3ServerURL, "application/dns-message", strings.NewReader(string(body)))
+	res, err := client.Do(req) //Post(dohttp3ServerURL, "application/dns-message", strings.NewReader(string(body)))
 	if err != nil {
 		log.Println(dohttp3ServerURL, err)
 		return nil, err