kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ws connect has a new option to send HTTP headers + use WebSocketHttpHeaders instead of unordered_map<string, string>

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-08-26 10:19:09 -07:00
parent 0847e60d2a
commit d3e5a63fa2
12 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ixwebsocket/IXWebSocket.cpp
View File

@ -70,7 +70,7 @@ namespace ix
std::lock_guard<std::mutex> lock(_configMutex);
_url = url;
}
void WebSocket::setExtraHeaders(const std::unordered_map<std::string, std::string>& headers)
void WebSocket::setExtraHeaders(const WebSocketHttpHeaders& headers)
{
std::lock_guard<std::mutex> lock(_configMutex);
_extraHeaders = headers;

8
ixwebsocket/IXWebSocket.h
View File

@ -21,7 +21,6 @@
#include <mutex>
#include <string>
#include <thread>
#include <unordered_map>
namespace ix
{
@ -45,8 +44,9 @@ namespace ix
~WebSocket();
void setUrl(const std::string& url);
void setExtraHeaders(const std::unordered_map<std::string, std::string>&
headers); // send extra headers in client handshake request
// send extra headers in client handshake request
void setExtraHeaders(const WebSocketHttpHeaders& headers);
void setPerMessageDeflateOptions(
const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
void setHeartBeatPeriod(int heartBeatPeriodSecs);
@ -114,7 +114,7 @@ namespace ix
WebSocketTransport _ws;
std::string _url;
std::unordered_map<std::string, std::string> _extraHeaders;
WebSocketHttpHeaders _extraHeaders;
WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
mutable std::mutex _configMutex; // protect all config variables access

2
ixwebsocket/IXWebSocketHandshake.cpp
View File

@ -88,7 +88,7 @@ namespace ix
}
WebSocketInitResult WebSocketHandshake::clientHandshake(const std::string& url,
const std::unordered_map<std::string, std::string>& extraHeaders,
const WebSocketHttpHeaders& extraHeaders,
const std::string& host,
const std::string& path,
int port,

2
ixwebsocket/IXWebSocketHandshake.h
View File

@ -53,7 +53,7 @@ namespace ix
WebSocketInitResult clientHandshake(
const std::string& url,
const std::unordered_map<std::string, std::string>& extraHeaders,
const WebSocketHttpHeaders& extraHeaders,
const std::string& host,
const std::string& path,
int port,

2
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -129,7 +129,7 @@ namespace ix
// Client
WebSocketInitResult WebSocketTransport::connectToUrl(
const std::string& url,
const std::unordered_map<std::string, std::string>& headers,
const WebSocketHttpHeaders& headers,
int timeoutSecs)
{
std::lock_guard<std::mutex> lock(_socketMutex);

4
ixwebsocket/IXWebSocketTransport.h
View File

@ -24,7 +24,7 @@
#include <memory>
#include <mutex>
#include <string>
#include <unordered_map>
#include <vector>
namespace ix
@ -78,7 +78,7 @@ namespace ix
WebSocketInitResult connectToUrl( // Client
const std::string& url,
const std::unordered_map<std::string, std::string>& headers,
const WebSocketHttpHeaders& headers,
int timeoutSecs);
WebSocketInitResult connectToSocket(int fd, // Server
int timeoutSecs);