talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass entire Autobahn over SSL

Browse Source
This commit is contained in:
Alex Hultman
2018-11-29 20:57:31 +01:00
parent 3e769fb841
commit 9d0e4f4771
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WebSocketContext.h
+28 -3
View File
@@ -91,7 +91,18 @@ private:
if (webSocketData->compressionStatus == WebSocketData::CompressionStatus::COMPRESSED_FRAME) { if (webSocketData->compressionStatus == WebSocketData::CompressionStatus::COMPRESSED_FRAME) {
webSocketData->compressionStatus = WebSocketData::CompressionStatus::ENABLED; webSocketData->compressionStatus = WebSocketData::CompressionStatus::ENABLED;
LoopData *loopData = (LoopData *) us_loop_ext(us_socket_context_loop(us_socket_get_context((us_socket *) s))); //LoopData *loopData = (LoopData *) us_loop_ext(us_socket_context_loop(us_socket_get_context((us_socket *) s)));
LoopData *loopData = (LoopData *) us_loop_ext(
static_dispatch(us_ssl_socket_context_loop, us_socket_context_loop)(
static_dispatch(us_ssl_socket_get_context, us_socket_get_context)((SOCKET_TYPE *) s)
)
);
std::string_view inflatedFrame = loopData->inflationStream->inflate({data, length}); std::string_view inflatedFrame = loopData->inflationStream->inflate({data, length});
if (!inflatedFrame.length()) { if (!inflatedFrame.length()) {
@@ -132,7 +143,21 @@ private:
// what's really the story here? // what's really the story here?
webSocketData->fragmentBuffer.append("...."); webSocketData->fragmentBuffer.append("....");
LoopData *loopData = (LoopData *) us_loop_ext(us_socket_context_loop(us_socket_get_context((us_socket *) s))); //LoopData *loopData = (LoopData *) us_loop_ext(us_socket_context_loop(us_socket_get_context((us_socket *) s)));
//LoopData *loopData = (LoopData *) us_loop_ext(us_socket_context_loop(us_socket_get_context((us_socket *) s)));
LoopData *loopData = (LoopData *) us_loop_ext(
static_dispatch(us_ssl_socket_context_loop, us_socket_context_loop)(
static_dispatch(us_ssl_socket_get_context, us_socket_get_context)((SOCKET_TYPE *) s)
)
);
std::string_view inflatedFrame = loopData->inflationStream->inflate({webSocketData->fragmentBuffer.data(), webSocketData->fragmentBuffer.length() - 4}); std::string_view inflatedFrame = loopData->inflationStream->inflate({webSocketData->fragmentBuffer.data(), webSocketData->fragmentBuffer.length() - 4});
if (!inflatedFrame.length()) { if (!inflatedFrame.length()) {
@@ -227,7 +252,7 @@ private:
// bug: todo // bug: todo
static bool refusePayloadLength(uint64_t length, uWS::WebSocketState<isServer> *wState) { static bool refusePayloadLength(uint64_t length, uWS::WebSocketState<isServer> *wState) {
std::cout << "refuse payload length" << std::endl; //std::cout << "refuse payload length" << std::endl;
/* We check if we want to accept such a frame based on size */ /* We check if we want to accept such a frame based on size */
// for now, accept anything // for now, accept anything
uSockets
+1 -1
Submodule uSockets updated: 790a95fba4...3d1f6fbb50