Clean up code

yarshure · Sep 12, 2015 · 88d212e · 88d212e
1 parent b0c5b81
commit 88d212e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/net/freedom/freedom.go b/net/freedom/freedom.go
@@ -64,8 +64,7 @@ func (vconn *FreedomConnection) DumpOutput(conn net.Conn, output chan<- []byte,
 }
 
 func (vconn *FreedomConnection) CloseConn(conn net.Conn, finish <-chan bool) {
-	for i := 0; i < 2; i++ {
-		<-finish
-	}
+	<-finish
+	<-finish
 	conn.Close()
 }
diff --git a/net/socks/socks.go b/net/socks/socks.go
@@ -155,7 +155,6 @@ func (server *SocksServer) dumpOutput(conn net.Conn, output <-chan []byte, finis
 }
 
 func (server *SocksServer) waitForFinish(finish <-chan bool) {
-	for i := 0; i < 2; i++ {
-		<-finish
-	}
+	<-finish
+	<-finish
 }
diff --git a/net/vmess/vmessin.go b/net/vmess/vmessin.go
@@ -120,9 +120,8 @@ func (handler *VMessInboundHandler) dumpOutput(writer io.Writer, output <-chan [
 }
 
 func (handler *VMessInboundHandler) waitForFinish(finish <-chan bool) {
-	for i := 0; i < 2; i++ {
-		<-finish
-	}
+	<-finish
+	<-finish
 }
 
 type VMessInboundHandlerFactory struct {

diff --git a/net/vmess/vmessout.go b/net/vmess/vmessout.go
@@ -146,9 +146,8 @@ func (handler *VMessOutboundHandler) dumpInput(writer io.Writer, input <-chan []
 }
 
 func (handler *VMessOutboundHandler) waitForFinish(finish <-chan bool) {
-	for i := 0; i < 2; i++ {
-		<-finish
-	}
+	<-finish
+	<-finish
 	log.Debug("Finishing waiting for VMessOutbound ending.")
 }