fix bug: socket not close when connection finished

cmd/go-mitmproxy/main.go

@@ -3,6 +3,9 @@ package main
 import (
 	"flag"
 	"fmt"
+
+	// slog "log"
+
 	"os"
 
 	"github.com/lqqyt2423/go-mitmproxy/addon"
@@ -50,6 +53,10 @@ func main() {
 		os.Exit(0)
 	}
 
+	// for debug
+	// slog.SetFlags(slog.LstdFlags | slog.Lshortfile)
+	// log.SetReportCaller(true)
+
 	log.SetLevel(log.InfoLevel)
 	log.SetReportCaller(false)
 	log.SetOutput(os.Stdout)

proxy/helper.go

@@ -18,6 +18,7 @@ var NormalErrMsgs []string = []string{
 	"io: read/write on closed pipe",
 	"connect: connection refused",
 	"connect: connection reset by peer",
+	"use of closed network connection",
 }
 
 // 仅打印预料之外的错误信息
@@ -39,20 +40,14 @@ func LogErr(log *_log.Entry, err error) (loged bool) {
 // 转发流量
 // Read a => Write b
 // Read b => Write a
-func Transfer(log *_log.Entry, a, b io.ReadWriter) {
+func Transfer(log *_log.Entry, a, b io.ReadWriteCloser) {
 	done := make(chan struct{})
 	defer close(done)
 
-	forward := func(dst io.Writer, src io.Reader, ec chan<- error) {
+	forward := func(dst io.WriteCloser, src io.Reader, ec chan<- error) {
 		_, err := io.Copy(dst, src)
-		if err != nil {
+
-			select {
+		dst.Close() // 当一端读结束时，结束另一端的写
-			case <-done:
-				return
-			case ec <- err:
-				return
-			}
-		}
 
 		select {
 		case <-done:

proxy/proxy.go

@@ -42,12 +42,12 @@ func NewProxy(opts *Options) (*Proxy, error) {
 		Transport: &http.Transport{
 			Proxy: http.ProxyFromEnvironment,
 			DialContext: (&net.Dialer{
-				Timeout:   30 * time.Second,
+				Timeout:   15 * time.Second,
 				KeepAlive: 30 * time.Second,
 				DualStack: true,
 			}).DialContext,
 			MaxIdleConns:          100,
-			IdleConnTimeout:       90 * time.Second,
+			IdleConnTimeout:       5 * time.Second,
 			TLSHandshakeTimeout:   10 * time.Second,
 			ExpectContinueTimeout: 1 * time.Second,
 			ForceAttemptHTTP2:     false, // disable http2
@@ -280,8 +280,8 @@ func (proxy *Proxy) handleConnect(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	// send RST other than FIN when finished, to avoid TIME_WAIT state
+	cconn.(*net.TCPConn).SetLinger(0) // send RST other than FIN when finished, to avoid TIME_WAIT state
-	cconn.(*net.TCPConn).SetLinger(0)
+	cconn.(*net.TCPConn).SetKeepAlive(false)
 	defer cconn.Close()
 
 	_, err = io.WriteString(cconn, "HTTP/1.1 200 Connection Established\r\n\r\n")