Fix copyLoop to break out the other goroutine on graceful exit.

This should fix sockets getting stuck in CLOSE_WAIT.

1 files changed, 4 insertions, 4 deletions

diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index 42a6740..255bdf1 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -88,22 +88,22 @@ func copyLoop(a, b net.Conn) {
 	go func() {
 		defer logAndRecover()
 		defer wg.Done()
+		defer b.Close()
+		defer a.Close()
 
 		_, err := io.Copy(b, a)
 		if err != nil {
-			b.Close()
-			a.Close()
 			log.Printf("[WARN] Connection closed: %s", err)
 		}
 	}()
 	go func() {
 		defer logAndRecover()
 		defer wg.Done()
+		defer a.Close()
+		defer b.Close()
 
 		_, err := io.Copy(a, b)
 		if err != nil {
-			a.Close()
-			b.Close()
 			log.Printf("[WARN] Connection closed: %s", err)
 		}
 	}()