diff --git a/src/App.h b/src/App.h index 53bcbd4..bf38c7a 100644 --- a/src/App.h +++ b/src/App.h @@ -127,7 +127,7 @@ public: } TemplatedApp(SocketContextOptions options = {}) { - httpContext = uWS::HttpContext::create(uWS::Loop::get(), options); + httpContext = HttpContext::create(Loop::get(), options); } bool constructorFailed() { @@ -151,12 +151,12 @@ public: /* Maximum socket lifetime in seconds before forced closure (defaults to disabled) */ unsigned short maxLifetime = 0; MoveOnlyFunction *, HttpRequest *, struct us_socket_context_t *)> upgrade = nullptr; - MoveOnlyFunction *)> open = nullptr; - MoveOnlyFunction *, std::string_view, uWS::OpCode)> message = nullptr; - MoveOnlyFunction *)> drain = nullptr; - MoveOnlyFunction *)> ping = nullptr; - MoveOnlyFunction *)> pong = nullptr; - MoveOnlyFunction *, int, std::string_view)> close = nullptr; + MoveOnlyFunction *)> open = nullptr; + MoveOnlyFunction *, std::string_view, OpCode)> message = nullptr; + MoveOnlyFunction *)> drain = nullptr; + MoveOnlyFunction *)> ping = nullptr; + MoveOnlyFunction *)> pong = nullptr; + MoveOnlyFunction *, int, std::string_view)> close = nullptr; }; template @@ -187,7 +187,7 @@ public: /* Quick fix to disable any compression if set */ #ifdef UWS_NO_ZLIB - behavior.compression = uWS::DISABLED; + behavior.compression = DISABLED; #endif /* If we are the first one to use compression, initialize it */ diff --git a/src/HttpContext.h b/src/HttpContext.h index 279c78c..70a74e1 100644 --- a/src/HttpContext.h +++ b/src/HttpContext.h @@ -133,7 +133,7 @@ private: #endif /* The return value is entirely up to us to interpret. The HttpParser only care for whether the returned value is DIFFERENT or not from passed user */ - void *returnedSocket = httpResponseData->consumePostPadded(data, (unsigned int) length, s, proxyParser, [httpContextData](void *s, uWS::HttpRequest *httpRequest) -> void * { + void *returnedSocket = httpResponseData->consumePostPadded(data, (unsigned int) length, s, proxyParser, [httpContextData](void *s, HttpRequest *httpRequest) -> void * { /* For every request we reset the timeout and hang until user makes action */ /* Warning: if we are in shutdown state, resetting the timer is a security issue! */ us_socket_timeout(SSL, (us_socket_t *) s, 0); diff --git a/src/HttpResponse.h b/src/HttpResponse.h index fcff3f9..88720a1 100644 --- a/src/HttpResponse.h +++ b/src/HttpResponse.h @@ -242,7 +242,7 @@ public: int wantedCompressionWindow = (webSocketContextData->compression & 0xFF00) >> 8; auto [negCompression, negCompressionWindow, negInflationWindow, negResponse] = - uWS::negotiateCompression(true, wantedCompressionWindow, wantedInflationWindow, + negotiateCompression(true, wantedCompressionWindow, wantedInflationWindow, secWebSocketExtensions); if (negCompression) { diff --git a/src/Loop.h b/src/Loop.h index 56cd7d6..305cc2d 100644 --- a/src/Loop.h +++ b/src/Loop.h @@ -18,7 +18,7 @@ #ifndef UWS_LOOP_H #define UWS_LOOP_H -/* The loop is lazily created per-thread and run with uWS::run() */ +/* The loop is lazily created per-thread and run with run() */ #include "LoopData.h" #include diff --git a/src/WebSocket.h b/src/WebSocket.h index 4d0b8fc..03c7dea 100644 --- a/src/WebSocket.h +++ b/src/WebSocket.h @@ -64,7 +64,7 @@ public: /* Send or buffer a WebSocket frame, compressed or not. Returns BACKPRESSURE on increased user space backpressure, * DROPPED on dropped message (due to backpressure) or SUCCCESS if you are free to send even more now. */ - SendStatus send(std::string_view message, uWS::OpCode opCode = uWS::OpCode::BINARY, bool compress = false) { + SendStatus send(std::string_view message, OpCode opCode = OpCode::BINARY, bool compress = false) { WebSocketContextData *webSocketContextData = (WebSocketContextData *) us_socket_context_ext(SSL, (us_socket_context_t *) us_socket_context(SSL, (us_socket_t *) this) ); diff --git a/src/WebSocketContext.h b/src/WebSocketContext.h index 819ab5a..f77f978 100644 --- a/src/WebSocketContext.h +++ b/src/WebSocketContext.h @@ -41,7 +41,7 @@ private: } /* If we have negotiated compression, set this frame compressed */ - static bool setCompressed(uWS::WebSocketState */*wState*/, void *s) { + static bool setCompressed(WebSocketState */*wState*/, void *s) { WebSocketData *webSocketData = (WebSocketData *) us_socket_ext(SSL, (us_socket_t *) s); if (webSocketData->compressionStatus == WebSocketData::CompressionStatus::ENABLED) { @@ -52,12 +52,12 @@ private: } } - static void forceClose(uWS::WebSocketState */*wState*/, void *s, std::string_view reason = {}) { + static void forceClose(WebSocketState */*wState*/, void *s, std::string_view reason = {}) { us_socket_close(SSL, (us_socket_t *) s, (int) reason.length(), (void *) reason.data()); } /* Returns true on breakage */ - static bool handleFragment(char *data, size_t length, unsigned int remainingBytes, int opCode, bool fin, uWS::WebSocketState *webSocketState, void *s) { + static bool handleFragment(char *data, size_t length, unsigned int remainingBytes, int opCode, bool fin, WebSocketState *webSocketState, void *s) { /* WebSocketData and WebSocketContextData */ WebSocketContextData *webSocketContextData = (WebSocketContextData *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s)); WebSocketData *webSocketData = (WebSocketData *) us_socket_ext(SSL, (us_socket_t *) s); @@ -90,7 +90,7 @@ private: /* Emit message event & break if we are closed or shut down when returning */ if (webSocketContextData->messageHandler) { - webSocketContextData->messageHandler((WebSocket *) s, std::string_view(data, length), (uWS::OpCode) opCode); + webSocketContextData->messageHandler((WebSocket *) s, std::string_view(data, length), (OpCode) opCode); if (us_socket_is_closed(SSL, (us_socket_t *) s) || webSocketData->isShuttingDown) { return true; } @@ -148,7 +148,7 @@ private: /* Emit message and check for shutdown or close */ if (webSocketContextData->messageHandler) { - webSocketContextData->messageHandler((WebSocket *) s, std::string_view(data, length), (uWS::OpCode) opCode); + webSocketContextData->messageHandler((WebSocket *) s, std::string_view(data, length), (OpCode) opCode); if (us_socket_is_closed(SSL, (us_socket_t *) s) || webSocketData->isShuttingDown) { return true; } @@ -224,7 +224,7 @@ private: return false; } - static bool refusePayloadLength(uint64_t length, uWS::WebSocketState */*wState*/, void *s) { + static bool refusePayloadLength(uint64_t length, WebSocketState */*wState*/, void *s) { auto *webSocketContextData = (WebSocketContextData *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s)); /* Return true for refuse, false for accept */ @@ -283,7 +283,7 @@ private: asyncSocket->cork(); /* This parser has virtually no overhead */ - uWS::WebSocketProtocol>::consume(data, (unsigned int) length, (WebSocketState *) webSocketData, s); + WebSocketProtocol>::consume(data, (unsigned int) length, (WebSocketState *) webSocketData, s); /* Uncorking a closed socekt is fine, in fact it is needed */ asyncSocket->uncork(); diff --git a/src/WebSocketContextData.h b/src/WebSocketContextData.h index 61fbea8..3f913df 100644 --- a/src/WebSocketContextData.h +++ b/src/WebSocketContextData.h @@ -47,8 +47,8 @@ private: public: /* The callbacks for this context */ - MoveOnlyFunction *)> openHandler = nullptr; - MoveOnlyFunction *, std::string_view, uWS::OpCode)> messageHandler = nullptr; + MoveOnlyFunction *)> openHandler = nullptr; + MoveOnlyFunction *, std::string_view, OpCode)> messageHandler = nullptr; MoveOnlyFunction *)> drainHandler = nullptr; MoveOnlyFunction *, int, std::string_view)> closeHandler = nullptr; /* Todo: these should take message also; breaking change for v0.18 */