Merge pull request #42 from LanXuage/fix-socks_global_var_and_local_var_conflict

shimmeris · web-flow · commit ca7ce02df997 · 2023-03-10T15:48:00.000+08:00
Fix the conflict between global sessions &amp; local sessions  in socks/socks.go
diff --git a/socks/socks.go b/socks/socks.go
@@ -61,7 +61,7 @@ func listenClient(port string) {
 }
 
 func forward(conn net.Conn) {
-	scfConn := pickConn(sessions)
+	scfConn := pickConn()
 
 	_forward := func(src, dest net.Conn) {
 		defer src.Close()
@@ -74,7 +74,7 @@ func forward(conn net.Conn) {
 
 }
 
-func pickConn(sessions []*yamux.Session) net.Conn {
+func pickConn() net.Conn {
 	for {
 		l := len(sessions)
 		if l == 0 {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func listenClient(port string) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func forward(conn net.Conn) {`
`64`		`- scfConn := pickConn(sessions)`
	`64`	`+ scfConn := pickConn()`
`65`	`65`
`66`	`66`	`_forward := func(src, dest net.Conn) {`
`67`	`67`	`defer src.Close()`
`@@ -74,7 +74,7 @@ func forward(conn net.Conn) {`
`74`	`74`
`75`	`75`	`}`
`76`	`76`
`77`		`-func pickConn(sessions []*yamux.Session) net.Conn {`
	`77`	`+func pickConn() net.Conn {`
`78`	`78`	`for {`
`79`	`79`	`l := len(sessions)`
`80`	`80`	`if l == 0 {`