Browse Source

[WebSocket] Fix client failing to connect to direct IP.

The bug was caused by not checking the TCP CONNECTING state
appropriately during the client handshake, and not checking the TCP
CONNECTED state during connection (which is unlikely, but might still
happen).
Fabio Alessandrelli 2 years ago
parent
commit
adb3d2338e
1 changed files with 4 additions and 2 deletions
  1. 4 2
      modules/websocket/wsl_peer.cpp

+ 4 - 2
modules/websocket/wsl_peer.cpp

@@ -320,7 +320,9 @@ void WSLPeer::_do_client_handshake() {
 	}
 	}
 
 
 	tcp->poll();
 	tcp->poll();
-	if (tcp->get_status() != StreamPeerTCP::STATUS_CONNECTED) {
+	if (tcp->get_status() == StreamPeerTCP::STATUS_CONNECTING) {
+		return; // Keep connecting.
+	} else if (tcp->get_status() != StreamPeerTCP::STATUS_CONNECTED) {
 		close(-1); // Failed to connect.
 		close(-1); // Failed to connect.
 		return;
 		return;
 	}
 	}
@@ -511,7 +513,7 @@ Error WSLPeer::connect_to_url(const String &p_url, bool p_verify_tls, Ref<X509Ce
 	resolver.start(host, port);
 	resolver.start(host, port);
 	resolver.try_next_candidate(tcp);
 	resolver.try_next_candidate(tcp);
 
 
-	if (tcp->get_status() != StreamPeerTCP::STATUS_CONNECTING && !resolver.has_more_candidates()) {
+	if (tcp->get_status() != StreamPeerTCP::STATUS_CONNECTING && tcp->get_status() != StreamPeerTCP::STATUS_CONNECTED && !resolver.has_more_candidates()) {
 		_clear();
 		_clear();
 		return FAILED;
 		return FAILED;
 	}
 	}