update

shadow/client.go

@@ -61,38 +61,37 @@ func handlerClient(conn net.Conn, serverAddress string, fakeAddressSNI string) {
 
 	p := &PackAppData{Conn: dial.NetConn()}
 
-	go io.Copy(conn, p)
-	go io.Copy(p, conn)
+	defer p.Close()
+	defer conn.Close()
+	exitCh := make(chan int, 1)
+
+	go MyCopy(conn, p, exitCh)
+	go MyCopy(p, conn, exitCh)
+	<-exitCh
 }
 
-func MyCopy(src io.ReadWriteCloser, dst io.ReadWriteCloser) {
+func MyCopy(src io.ReadWriteCloser, dst io.ReadWriteCloser, ch chan int) {
 	buf := make([]byte, 32*1024)
 	for {
 		nr, er := src.Read(buf)
-		if nr > 0 {
-			nw, ew := dst.Write(buf[0:nr])
-			if nw < 0 || nr < nw {
-				nw = 0
-				if ew == nil {
-					fmt.Printf("err1:\n")
-				}
+		if er != nil {
+			if er == io.EOF {
+				break
+			} else {
+				fmt.Printf("Read err: %v\n", er)
+				break
 			}
+		} else {
+			nw, ew := dst.Write(buf[0:nr])
 			if ew != nil {
-				fmt.Printf("err2:%v\n", ew)
+				fmt.Printf("Write error:%v\n", ew)
 				break
 			}
 			if nr != nw {
-				fmt.Printf("nr != nw \n")
+				fmt.Printf("Write less then buffered \n")
 				break
 			}
 		}
-		if er != nil {
-			if er != io.EOF {
-				fmt.Printf("err3:%v\n", er)
-			} else {
-				fmt.Println("EOF")
-			}
-			break
-		}
 	}
+	ch <- 1
 }