diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-06 14:47:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 14:47:37 +0100 |
| commit | 97774f6f69a5566a526c161411ecdf34a5a90b14 (patch) | |
| tree | 822e398f89f1e4e9af9638454d0994d3d5785e68 /modules/websocket/lws_client.cpp | |
| parent | 9b5c6f539b0049cbcf12507167eb028013219c45 (diff) | |
| parent | 6d64a54d75ca0ad2bfd11a8acc3aeb2444b60cee (diff) | |
| download | redot-engine-97774f6f69a5566a526c161411ecdf34a5a90b14.tar.gz | |
Merge pull request #26688 from Faless/net/lws_3.1
Update libwebsockets to 3.1, fix IPv6 issues
Diffstat (limited to 'modules/websocket/lws_client.cpp')
| -rw-r--r-- | modules/websocket/lws_client.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/websocket/lws_client.cpp b/modules/websocket/lws_client.cpp index 2dce0ed1f5..d09558ab22 100644 --- a/modules/websocket/lws_client.cpp +++ b/modules/websocket/lws_client.cpp @@ -34,7 +34,10 @@ #include "core/io/ip.h" #include "core/io/stream_peer_ssl.h" #include "core/project_settings.h" -#include "tls/mbedtls/wrapper/include/openssl/ssl.h" +#if defined(LWS_OPENSSL_SUPPORT) +// Not openssl, just the mbedtls wrapper +#include "openssl/ssl.h" +#endif Error LWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, PoolVector<String> p_protocols) { @@ -121,6 +124,7 @@ int LWSClient::_handle_cb(struct lws *wsi, enum lws_callback_reasons reason, voi LWSPeer::PeerData *peer_data = (LWSPeer::PeerData *)user; switch (reason) { +#if defined(LWS_OPENSSL_SUPPORT) case LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS: { PoolByteArray arr = StreamPeerSSL::get_project_cert_array(); if (arr.size() > 0) @@ -128,7 +132,7 @@ int LWSClient::_handle_cb(struct lws *wsi, enum lws_callback_reasons reason, voi else if (verify_ssl) WARN_PRINTS("No CA cert specified in project settings, SSL will not work"); } break; - +#endif case LWS_CALLBACK_CLIENT_ESTABLISHED: peer->set_wsi(wsi, _in_buf_size, _in_pkt_size, _out_buf_size, _out_pkt_size); peer_data->peer_id = 0; |