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

adding in optional ability to add headers

Browse Source
This commit is contained in:
talksik
2024-01-30 10:58:11 -08:00
parent afc1d8cfc5
commit f7659c5764
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easywsclient.cpp
+22 -7
View File
@@ -1,4 +1,5 @@
#include <map>
#ifdef _WIN32
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS // _CRT_SECURE_NO_WARNINGS for sscanf errors in MSVC2013 Express
@@ -119,7 +120,7 @@ class _DummyWebSocket : public easywsclient::WebSocket
void sendBinary(const std::string& message) { }
void sendBinary(const std::vector<uint8_t>& message) { }
void sendPing() { }
void close() { }
void close() { }
readyStateValues getReadyState() const { return CLOSED; }
void _dispatch(Callback_Imp & callable) { }
void _dispatchBinary(BytesCallback_Imp& callable) { }
@@ -340,7 +341,7 @@ class _RealWebSocket : public easywsclient::WebSocket
// We got a whole message, now do something with it:
if (false) { }
else if (
ws.opcode == wsheader_type::TEXT_FRAME
ws.opcode == wsheader_type::TEXT_FRAME
|| ws.opcode == wsheader_type::BINARY_FRAME
|| ws.opcode == wsheader_type::CONTINUATION
) {
@@ -454,7 +455,7 @@ class _RealWebSocket : public easywsclient::WebSocket
};
easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask, const std::string& origin) {
easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask, const std::string& origin, const std::map<std::string, std::string>& extraHeaders) {
char host[512];
int port;
char path[512];
@@ -506,6 +507,12 @@ easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask,
if (!origin.empty()) {
snprintf(line, 1024, "Origin: %s\r\n", origin.c_str()); ::send(sockfd, line, strlen(line), 0);
}
if (!extraHeaders.empty()) {
for (auto header : extraHeaders) {
snprintf(line, 1024, "%s: %s\r\n", header.first.c_str(), header.second.c_str());
::send(sockfd, line, strlen(line), 0);
}
}
snprintf(line, 1024, "Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n"); ::send(sockfd, line, strlen(line), 0);
snprintf(line, 1024, "Sec-WebSocket-Version: 13\r\n"); ::send(sockfd, line, strlen(line), 0);
snprintf(line, 1024, "\r\n"); ::send(sockfd, line, strlen(line), 0);
@@ -543,12 +550,20 @@ WebSocket::pointer WebSocket::create_dummy() {
}
WebSocket::pointer WebSocket::from_url(const std::string& url, const std::string& origin) {
return ::from_url(url, true, origin);
WebSocket::pointer WebSocket::from_url(
const std::string& url,
const std::string& origin,
const std::map<std::string, std::string>& extraHeaders
) {
return ::from_url(url, true, origin, extraHeaders);
}
WebSocket::pointer WebSocket::from_url_no_mask(const std::string& url, const std::string& origin) {
return ::from_url(url, false, origin);
WebSocket::pointer WebSocket::from_url_no_mask(
const std::string& url,
const std::string& origin,
const std::map<std::string, std::string>& extraHeaders
) {
return ::from_url(url, false, origin, extraHeaders);
}
easywsclient.hpp
+11 -2
View File
@@ -8,6 +8,7 @@
// wget https://raw.github.com/dhbaird/easywsclient/master/easywsclient.hpp
// wget https://raw.github.com/dhbaird/easywsclient/master/easywsclient.cpp
#include <map>
#include <string>
#include <vector>
@@ -23,8 +24,16 @@ class WebSocket {
// Factories:
static pointer create_dummy();
static pointer from_url(const std::string& url, const std::string& origin = std::string());
static pointer from_url_no_mask(const std::string& url, const std::string& origin = std::string());
static pointer from_url(
const std::string& url,
const std::string& origin = std::string(),
const std::map<std::string, std::string>& extraHeaders = std::map<std::string, std::string>()
);
static pointer from_url_no_mask(
const std::string& url,
const std::string& origin = std::string(),
const std::map<std::string, std::string>& extraHeaders = std::map<std::string, std::string>()
);
// Interfaces:
virtual ~WebSocket() { }