client_https.go

@@ -1,59 +1,59 @@
-package main
+package main
-
+
-import (
+import (
-	"bytes"
+	"bytes"
-	"context"
+	"context"
-	"fmt"
+	"fmt"
-	"io"
+	"io/ioutil"
-	"net/http"
+	"net/http"
-	"time"
+	"time"
-
+
-	"github.com/miekg/dns"
+	"github.com/miekg/dns"
-)
+)
-
+
-type httpclient struct {
+type httpclient struct {
-	Net        string
+	Net        string
-	Timeout    time.Duration
+	Timeout    time.Duration
-	HTTPClient *http.Client
+	HTTPClient *http.Client
-}
+}
-
+
-func (c *httpclient) Exchange(msg *dns.Msg, upstream string) (*dns.Msg, int, error) {
+func (c *httpclient) Exchange(msg *dns.Msg, upstream string) (*dns.Msg, int, error) {
-	data, err := msg.Pack()
+	data, err := msg.Pack()
-	if err != nil {
+	if err != nil {
-		return nil, 0, err
+		return nil, 0, err
-	}
+	}
-
+
-	req, err := http.NewRequest("POST", upstream, bytes.NewReader(data))
+	req, err := http.NewRequest("POST", upstream, bytes.NewReader(data))
-	if err != nil {
+	if err != nil {
-		return nil, 0, err
+		return nil, 0, err
-	}
+	}
-
+
-	req.Header.Set("Content-Type", dnsMsgType)
+	req.Header.Set("Content-Type", dnsMsgType)
-
+
-	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
+	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
-	defer cancel()
+	defer cancel()
-
+
-	req = req.WithContext(ctx)
+	req = req.WithContext(ctx)
-
+
-	resp, err := c.HTTPClient.Do(req)
+	resp, err := c.HTTPClient.Do(req)
-	if err != nil {
+	if err != nil {
-		return nil, 0, err
+		return nil, 0, err
-	}
+	}
-	defer resp.Body.Close()
+	defer resp.Body.Close()
-
+
-	if resp.StatusCode != http.StatusOK {
+	if resp.StatusCode != http.StatusOK {
-		return nil, 0, fmt.Errorf("http error %d", resp.StatusCode)
+		return nil, 0, fmt.Errorf("http error %d", resp.StatusCode)
-	}
+	}
-
+
-	data, err = io.ReadAll(resp.Body)
+	data, err = ioutil.ReadAll(resp.Body)
-	if err != nil {
+	if err != nil {
-		return nil, 0, err
+		return nil, 0, err
-	}
+	}
-
+
-	m := new(dns.Msg)
+	m := new(dns.Msg)
-	if err = m.Unpack(data); err != nil {
+	if err = m.Unpack(data); err != nil {
-		return nil, 0, err
+		return nil, 0, err
-	}
+	}
-
+
-	return m, 0, nil
+	return m, 0, nil
-}
+}

config.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"os"
+	"io/ioutil"
 
 	"github.com/go-yaml/yaml"
 )
@@ -21,7 +21,7 @@ type listen struct {
 }
 
 func loadConfig(f string) (*conf, error) {
-	data, err := os.ReadFile(f)
+	data, err := ioutil.ReadFile(f)
 	if err != nil {
 		return nil, err
 	}

main.go

@@ -61,7 +61,9 @@ func main() {
 	makeServers(cfg)
 	ch := make(chan os.Signal, 2)
 	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
-	s := <-ch
+	select {
-	log.Errorf("received signal %s, exit...", s)
+	case s := <-ch:
+		log.Errorf("received signal %s, exit...", s)
+	}
 	log.Println("exit.")
 }

server_https.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"io"
+	"io/ioutil"
 	"net/http"
 
 	log "github.com/fangdingjun/go-log/v5"
@@ -26,7 +26,7 @@ func (srv *server) handleHTTPReq(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	data, err := io.ReadAll(r.Body)
+	data, err := ioutil.ReadAll(r.Body)
 	if err != nil {
 		log.Errorln("read request body", err)
 		http.Error(w, "read request failed", http.StatusBadRequest)