Default param "" for protocol instead of overloading for encode_websocket_handshake_request

Author: nicolaspoffley

Framework/Core/src/HTTPParser.cxx

@@ -214,27 +214,26 @@ std::string HTTPParserHelpers::calculateAccept(const char* nonce)
   return fmt::format("{}", base);
 }
 
-std::string encode_websocket_handshake_reply(char const* nonce)
+std::string encode_websocket_handshake_reply(char const* nonce, char const* protocol = "")
 {
-  constexpr auto res =
-    "HTTP/1.1 101 Switching Protocols\r\n"
-    "Upgrade: websocket\r\n"
-    "Connection: Upgrade\r\n"
-    "Access-Control-Allow-Origin: \"*\"\r\n"
-    "Sec-WebSocket-Accept: {}\r\n\r\n";
-  return fmt::format(res, HTTPParserHelpers::calculateAccept(nonce));
-}
-
-std::string encode_websocket_handshake_reply(char const* nonce, char const* protocol)
-{
-  constexpr auto res =
-    "HTTP/1.1 101 Switching Protocols\r\n"
-    "Upgrade: websocket\r\n"
-    "Connection: Upgrade\r\n"
-    "Access-Control-Allow-Origin: \"*\"\r\n"
-    "Sec-WebSocket-Protocol: {}\r\n"
-    "Sec-WebSocket-Accept: {}\r\n\r\n";
-  return fmt::format(res, protocol, HTTPParserHelpers::calculateAccept(nonce));
+  if (strlen(protocol) == 0) {
+    constexpr auto res =
+      "HTTP/1.1 101 Switching Protocols\r\n"
+      "Upgrade: websocket\r\n"
+      "Connection: Upgrade\r\n"
+      "Access-Control-Allow-Origin: \"*\"\r\n"
+      "Sec-WebSocket-Accept: {}\r\n\r\n";
+    return fmt::format(res, HTTPParserHelpers::calculateAccept(nonce));
+  } else {
+    constexpr auto res =
+      "HTTP/1.1 101 Switching Protocols\r\n"
+      "Upgrade: websocket\r\n"
+      "Connection: Upgrade\r\n"
+      "Access-Control-Allow-Origin: \"*\"\r\n"
+      "Sec-WebSocket-Protocol: {}\r\n"
+      "Sec-WebSocket-Accept: {}\r\n\r\n";
+    return fmt::format(res, protocol, HTTPParserHelpers::calculateAccept(nonce));
+  }
 }
 
 void parse_http_request(char* start, size_t size, HTTPParser* parser)

Framework/Core/src/HTTPParser.h

@@ -125,9 +125,8 @@ std::string encode_websocket_handshake_request(const char* path, const char* pro
 
 /// Encodes the server reply for a given websocket connection
 /// @a nonce the nonce of the request.
-std::string encode_websocket_handshake_reply(char const* nonce);
 /// @a protocol the websocket subprotocol to confirm (optional)
-std::string encode_websocket_handshake_reply(char const* nonce, char const* protocol);
+std::string encode_websocket_handshake_reply(char const* nonce, char const* protocol = "");
 
 /// Encodes the buffer @a src which is @a size long to a number of buffers suitable to be sent via libuv.
 /// If @a binary is provided the binary bit is set.