diff --git a/redirector/redirector.go b/redirector/redirector.go index c5910f3..ae4068b 100644 --- a/redirector/redirector.go +++ b/redirector/redirector.go @@ -10,8 +10,6 @@ import ( "github.com/p4gefau1t/trojan-go/log" ) -const Name = "REDIRECTOR" - type Dial func(net.Addr) (net.Conn, error) func defaultDial(addr net.Addr) (net.Conn, error) { diff --git a/test/util/target.go b/test/util/target.go index b574beb..a0fa45d 100644 --- a/test/util/target.go +++ b/test/util/target.go @@ -58,14 +58,15 @@ func runTCPEchoServer() { common.Must(err) wg.Done() go func() { + defer listener.Close() for { conn, err := listener.Accept() if err != nil { return } go func(conn net.Conn) { + defer conn.Close() for { - conn.SetDeadline(time.Now().Add(time.Second)) buf := make([]byte, 2048) n, err := conn.Read(buf) if err != nil { @@ -112,6 +113,7 @@ func runTCPBlackHoleServer() { common.Must(err) wg.Done() go func() { + defer listener.Close() for { conn, err := listener.Accept() if err != nil { @@ -130,6 +132,7 @@ func runUDPBlackHoleServer() { common.Must(err) wg.Done() go func() { + defer conn.Close() buf := make([]byte, 1024*8) for { _, _, err := conn.ReadFrom(buf[:])