kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(openssl + mbedssl) fix #140, can send large files with ws send over ssl / still broken with apple ssl

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-01-12 11:08:44 -08:00
parent a8ff91ac3c
commit 4cbf85f4d4
4 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.md
View File

@@ -1,6 +1,10 @@
# Changelog # Changelog
All changes to this project will be documented in this file. All changes to this project will be documented in this file.
## [7.9.4] - 2020-01-12
(openssl + mbedssl) fix #140, can send large files with ws send over ssl / still broken with apple ssl
## [7.9.3] - 2020-01-10 ## [7.9.3] - 2020-01-10
(apple ssl) model write method after the OpenSSL one for consistency (apple ssl) model write method after the OpenSSL one for consistency

9
ixwebsocket/IXSocketMbedTLS.cpp
View File

@@ -229,10 +229,6 @@ namespace ix
} }
ssize_t SocketMbedTLS::send(char* buf, size_t nbyte) ssize_t SocketMbedTLS::send(char* buf, size_t nbyte)
{
ssize_t sent = 0;
while (nbyte > 0)
{ {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
@@ -240,8 +236,7 @@ namespace ix
if (res > 0) if (res > 0)
{ {
nbyte -= res; return res;
sent += res;
} }
else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE) else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE)
{ {
@@ -253,8 +248,6 @@ namespace ix
return -1; return -1;
} }
} }
return sent;
}
ssize_t SocketMbedTLS::send(const std::string& buffer) ssize_t SocketMbedTLS::send(const std::string& buffer)
{ {

11
ixwebsocket/IXSocketOpenSSL.cpp
View File

@@ -602,10 +602,6 @@ namespace ix
} }
ssize_t SocketOpenSSL::send(char* buf, size_t nbyte) ssize_t SocketOpenSSL::send(char* buf, size_t nbyte)
{
ssize_t sent = 0;
while (nbyte > 0)
{ {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
@@ -615,13 +611,12 @@ namespace ix
} }
ERR_clear_error(); ERR_clear_error();
ssize_t write_result = SSL_write(_ssl_connection, buf + sent, (int) nbyte); ssize_t write_result = SSL_write(_ssl_connection, buf, (int) nbyte);
int reason = SSL_get_error(_ssl_connection, (int) write_result); int reason = SSL_get_error(_ssl_connection, (int) write_result);
if (reason == SSL_ERROR_NONE) if (reason == SSL_ERROR_NONE)
{ {
nbyte -= write_result; return write_result;
sent += write_result;
} }
else if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE) else if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
{ {
@@ -633,8 +628,6 @@ namespace ix
return -1; return -1;
} }
} }
return sent;
}
ssize_t SocketOpenSSL::send(const std::string& buffer) ssize_t SocketOpenSSL::send(const std::string& buffer)
{ {

2
ixwebsocket/IXWebSocketVersion.h
View File

@@ -6,4 +6,4 @@
#pragma once #pragma once
#define IX_WEBSOCKET_VERSION "7.9.3" #define IX_WEBSOCKET_VERSION "7.9.4"