Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #60761 from Faless/net/4.x_fix_tcp_server_ws

Browse source 
[Net] Fix TCPServer and WSLClient status after "poll" refactoring.
This commit is contained in:
Fabio Alessandrelli 2022-05-04 21:13:55 +02:00 • committed by GitHub
commit d38d05c298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/io/stream_peer_tcp.cpp
View file

@ -81,7 +81,7 @@ void StreamPeerTCP::accept_socket(Ref<NetSocket> p_sock, IPAddress p_host, uint1
_sock->set_blocking_enabled(false); _sock->set_blocking_enabled(false);
timeout = OS::get_singleton()->get_ticks_msec() + (((uint64_t)GLOBAL_GET("network/limits/tcp/connect_timeout_seconds")) * 1000); timeout = OS::get_singleton()->get_ticks_msec() + (((uint64_t)GLOBAL_GET("network/limits/tcp/connect_timeout_seconds")) * 1000);
status = STATUS_CONNECTING; status = STATUS_CONNECTED;
peer_host = p_host; peer_host = p_host;
peer_port = p_port; peer_port = p_port;

12
modules/websocket/wsl_client.cpp
View file

@ -91,6 +91,7 @@ void WSLClient::_do_handshake() {
data->id = 1; data->id = 1;
_peer->make_context(data, _in_buf_size, _in_pkt_size, _out_buf_size, _out_pkt_size); _peer->make_context(data, _in_buf_size, _in_pkt_size, _out_buf_size, _out_pkt_size);
_peer->set_no_delay(true); _peer->set_no_delay(true);
_status = CONNECTION_CONNECTED;
_on_connect(protocol); _on_connect(protocol);
break; break;
} }
@ -231,6 +232,7 @@ Error WSLClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
} }
request += "\r\n"; request += "\r\n";
_request = request.utf8(); _request = request.utf8();
_status = CONNECTION_CONNECTING;
return OK; return OK;
} }
@ -337,21 +339,19 @@ Ref<WebSocketPeer> WSLClient::get_peer(int p_peer_id) const {
} }
MultiplayerPeer::ConnectionStatus WSLClient::get_connection_status() const { MultiplayerPeer::ConnectionStatus WSLClient::get_connection_status() const {
// This is surprising, but keeps the current behaviour to allow clean close requests.
// TODO Refactor WebSocket and split Client/Server/Multiplayer like done in other peers.
if (_peer->is_connected_to_host()) { if (_peer->is_connected_to_host()) {
return CONNECTION_CONNECTED; return CONNECTION_CONNECTED;
} }
return _status;
if (_tcp->get_status() == StreamPeerTCP::STATUS_CONNECTING || _resolver_id != IP::RESOLVER_INVALID_ID) {
return CONNECTION_CONNECTING;
}
return CONNECTION_DISCONNECTED;
} }
void WSLClient::disconnect_from_host(int p_code, String p_reason) { void WSLClient::disconnect_from_host(int p_code, String p_reason) {
_peer->close(p_code, p_reason); _peer->close(p_code, p_reason);
_connection = Ref<StreamPeer>(nullptr); _connection = Ref<StreamPeer>(nullptr);
_tcp = Ref<StreamPeerTCP>(memnew(StreamPeerTCP)); _tcp = Ref<StreamPeerTCP>(memnew(StreamPeerTCP));
_status = CONNECTION_DISCONNECTED;
_key = ""; _key = "";
_host = ""; _host = "";

3
modules/websocket/wsl_client.h
View file

@ -52,6 +52,7 @@ private:
Ref<WSLPeer> _peer; Ref<WSLPeer> _peer;
Ref<StreamPeerTCP> _tcp; Ref<StreamPeerTCP> _tcp;
Ref<StreamPeer> _connection; Ref<StreamPeer> _connection;
ConnectionStatus _status = CONNECTION_DISCONNECTED;
CharString _request; CharString _request;
int _requested = 0; int _requested = 0;
@ -59,8 +60,6 @@ private:
uint8_t _resp_buf[WSL_MAX_HEADER_SIZE]; uint8_t _resp_buf[WSL_MAX_HEADER_SIZE];
int _resp_pos = 0; int _resp_pos = 0;
String _response;
String _key; String _key;
String _host; String _host;
uint16_t _port = 0; uint16_t _port = 0;