godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTTP client now uses non blocking handshake

Browse Source
This commit is contained in:
Fabio Alessandrelli 2018-07-15 01:38:52 +02:00
parent 99d0b7ba14
commit 9ba8f0d2d8
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/io/http_client.cpp
View File

@ -279,6 +279,7 @@ void HTTPClient::close() {
chunk_left = 0; chunk_left = 0;
read_until_eof = false; read_until_eof = false;
response_num = 0; response_num = 0;
handshaking = false;
} }
Error HTTPClient::poll() { Error HTTPClient::poll() {
@ -327,16 +328,40 @@ Error HTTPClient::poll() {
} break; } break;
case StreamPeerTCP::STATUS_CONNECTED: { case StreamPeerTCP::STATUS_CONNECTED: {
if (ssl) { if (ssl) {
Ref<StreamPeerSSL> ssl = StreamPeerSSL::create(); Ref<StreamPeerSSL> ssl;
Error err = ssl->connect_to_stream(tcp_connection, ssl_verify_host, conn_host); if (!handshaking) {
if (err != OK) { // Connect the StreamPeerSSL and start handshaking
ssl = Ref<StreamPeerSSL>(StreamPeerSSL::create());
ssl->set_blocking_handshake_enabled(false);
Error err = ssl->connect_to_stream(tcp_connection, ssl_verify_host, conn_host);
if (err != OK) {
close();
status = STATUS_SSL_HANDSHAKE_ERROR;
return ERR_CANT_CONNECT;
}
connection = ssl;
handshaking = true;
} else {
// We are already handshaking, which means we can use your already active SSL connection
ssl = static_cast<Ref<StreamPeerSSL> >(connection);
ssl->poll(); // Try to finish the handshake
}
if (ssl->get_status() == StreamPeerSSL::STATUS_CONNECTED) {
// Handshake has been successfull
handshaking = false;
status = STATUS_CONNECTED;
return OK;
} else if (ssl->get_status() != StreamPeerSSL::STATUS_HANDSHAKING) {
// Handshake has failed
close(); close();
status = STATUS_SSL_HANDSHAKE_ERROR; status = STATUS_SSL_HANDSHAKE_ERROR;
return ERR_CANT_CONNECT; return ERR_CANT_CONNECT;
} }
connection = ssl; // ... we will need to poll more for handshake to finish
} else {
status = STATUS_CONNECTED;
} }
status = STATUS_CONNECTED;
return OK; return OK;
} break; } break;
case StreamPeerTCP::STATUS_ERROR: case StreamPeerTCP::STATUS_ERROR:
@ -669,6 +694,7 @@ HTTPClient::HTTPClient() {
response_num = 0; response_num = 0;
ssl = false; ssl = false;
blocking = false; blocking = false;
handshaking = false;
read_chunk_size = 4096; read_chunk_size = 4096;
} }

1
core/io/http_client.h
View File

@ -165,6 +165,7 @@ private:
bool ssl; bool ssl;
bool ssl_verify_host; bool ssl_verify_host;
bool blocking; bool blocking;
bool handshaking;
Vector<uint8_t> response_str; Vector<uint8_t> response_str;