diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-27 13:56:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 13:56:58 +0200 |
| commit | 6e6fe2b025cf2d2e6ecbc2d536a6ed614f6486c6 (patch) | |
| tree | 5347db9b0a50bb4a39d453ca46eefc9eea12f180 /modules | |
| parent | 17374944796a9338a2225473c9af693b4b578e18 (diff) | |
| parent | 331f1662df41b4e7afff30d2fe4019a413499c1c (diff) | |
Merge pull request #59582 from Faless/net/4.x_tcp_explicit_poll
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mbedtls/packet_peer_mbed_dtls.cpp | 2 | ||||
| -rw-r--r-- | modules/websocket/wsl_client.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/mbedtls/packet_peer_mbed_dtls.cpp b/modules/mbedtls/packet_peer_mbed_dtls.cpp index ddc2e945a7..1296a4587c 100644 --- a/modules/mbedtls/packet_peer_mbed_dtls.cpp +++ b/modules/mbedtls/packet_peer_mbed_dtls.cpp @@ -115,7 +115,7 @@ Error PacketPeerMbedDTLS::_do_handshake() { } Error PacketPeerMbedDTLS::connect_to_peer(Ref<PacketPeerUDP> p_base, bool p_validate_certs, const String &p_for_hostname, Ref<X509Certificate> p_ca_certs) { - ERR_FAIL_COND_V(!p_base.is_valid() || !p_base->is_connected_to_host(), ERR_INVALID_PARAMETER); + ERR_FAIL_COND_V(!p_base.is_valid() || !p_base->is_socket_connected(), ERR_INVALID_PARAMETER); base = p_base; int ret = 0; diff --git a/modules/websocket/wsl_client.cpp b/modules/websocket/wsl_client.cpp index 1ef571b6ee..58c329f043 100644 --- a/modules/websocket/wsl_client.cpp +++ b/modules/websocket/wsl_client.cpp @@ -273,6 +273,7 @@ void WSLClient::poll() { return; // Not connected. } + _tcp->poll(); switch (_tcp->get_status()) { case StreamPeerTCP::STATUS_NONE: // Clean close @@ -336,7 +337,7 @@ MultiplayerPeer::ConnectionStatus WSLClient::get_connection_status() const { return CONNECTION_CONNECTED; } - if (_tcp->is_connected_to_host() || _resolver_id != IP::RESOLVER_INVALID_ID) { + if (_tcp->get_status() == StreamPeerTCP::STATUS_CONNECTING || _resolver_id != IP::RESOLVER_INVALID_ID) { return CONNECTION_CONNECTING; } |