From 29a72f9af8c58b49b24c1a1d6a36492382581227 Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Sun, 21 Nov 2021 00:51:27 -0800
Subject: [PATCH] WebSocketServer: Use WebSocketOpCode where possible
---
src/websocketserver/WebSocketServer.h | 8 ++++----
src/websocketserver/WebSocketServer_Protocol.cpp | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/websocketserver/WebSocketServer.h b/src/websocketserver/WebSocketServer.h
index 65f34c6b..315338c8 100644
--- a/src/websocketserver/WebSocketServer.h
+++ b/src/websocketserver/WebSocketServer.h
@@ -75,8 +75,8 @@ class WebSocketServer : QObject
std::string AuthenticationSalt;
signals:
- void ClientConnected(const WebSocketSessionState state);
- void ClientDisconnected(const WebSocketSessionState state, const uint16_t closeCode);
+ void ClientConnected(WebSocketSessionState state);
+ void ClientDisconnected(WebSocketSessionState state, uint16_t closeCode);
private:
struct ProcessResult {
@@ -93,8 +93,8 @@ class WebSocketServer : QObject
void onClose(websocketpp::connection_hdl hdl);
void onMessage(websocketpp::connection_hdl hdl, websocketpp::server<websocketpp::config::asio>::message_ptr message);
- void SetSessionParameters(SessionPtr session, WebSocketServer::ProcessResult &ret, const json &payloadData);
- void ProcessMessage(SessionPtr session, ProcessResult &ret, const uint8_t opCode, json &payloadData);
+ void SetSessionParameters(SessionPtr session, WebSocketServer::ProcessResult &ret, json &payloadData);
+ void ProcessMessage(SessionPtr session, ProcessResult &ret, WebSocketOpCode::WebSocketOpCode opCode, json &payloadData);
void ProcessRequestBatch(SessionPtr session, ObsWebSocketRequestBatchExecutionType executionType, std::vector<json> &requests, std::vector<json> &results, json &variables);
diff --git a/src/websocketserver/WebSocketServer_Protocol.cpp b/src/websocketserver/WebSocketServer_Protocol.cpp
index 8215ec1f..6d36587e 100644
--- a/src/websocketserver/WebSocketServer_Protocol.cpp
+++ b/src/websocketserver/WebSocketServer_Protocol.cpp
@@ -33,7 +33,7 @@ bool IsSupportedRpcVersion(uint8_t requestedVersion)
return (requestedVersion == 1);
}
-void WebSocketServer::SetSessionParameters(SessionPtr session, ProcessResult &ret, const json &payloadData)
+void WebSocketServer::SetSessionParameters(SessionPtr session, ProcessResult &ret, json &payloadData)
{
if (payloadData.contains("ignoreInvalidMessages")) {
if (!payloadData["ignoreInvalidMessages"].is_boolean()) {
@@ -54,7 +54,7 @@ void WebSocketServer::SetSessionParameters(SessionPtr session, ProcessResult &re
}
}
-void WebSocketServer::ProcessMessage(SessionPtr session, WebSocketServer::ProcessResult &ret, uint8_t opCode, json &payloadData)
+void WebSocketServer::ProcessMessage(SessionPtr session, WebSocketServer::ProcessResult &ret, WebSocketOpCode::WebSocketOpCode opCode, json &payloadData)
{
if (!payloadData.is_object()) {
if (payloadData.is_null()) {