merge(client): Merge pull request #68 from genshen/fix-error-passing-…

…in-client fix(client): fix the incorrect error passing in client side data transmission (in `Client.transData` of file `wss/wssocks_client.go`)
genshen · Jul 31, 2023 · ad3afab · ad3afab
2 parents 8a095c0 + cf056fb
commit ad3afab
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/wss/wssocks_client.go b/wss/wssocks_client.go
@@ -147,7 +147,8 @@ func (client *Client) transData(wsc *WebSocketClient, conn *net.TCPConn, firstSe
 	// tell server to establish connection
 	if err := proxy.Establish(wsc, firstSendData, proxyType, addr); err != nil {
 		wsc.RemoveProxy(proxy.Id)
-		if err := wsc.TellClose(proxy.Id); err != nil {
+        err := wsc.TellClose(proxy.Id)
+        if err != nil {
 			log.Error("close error", err)
 		}
 		return err
@@ -161,7 +162,7 @@ func (client *Client) transData(wsc *WebSocketClient, conn *net.TCPConn, firstSe
 		if err != nil {
 			log.Error("write error: ", err)
 		}
-		done <- Done{true, nil}
+        done <- Done{true, err}
 	}()
 	defer writer.CloseWsWriter(cancel) // cancel data writing