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

Added optional origin header field

Browse Source
This commit is contained in:
Donald Pillou
2013-12-30 13:22:41 +01:00
parent 4dfa56b8cd
commit 3d76a2ece9
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easywsclient.cpp
+12 -5
View File
@@ -381,7 +381,7 @@ class _RealWebSocket : public easywsclient::WebSocket
}; };
easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask) { easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask, const std::string& origin) {
char host[128]; char host[128];
int port; int port;
char path[128]; char path[128];
@@ -389,6 +389,10 @@ easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask)
fprintf(stderr, "ERROR: url size limit exceeded: %s\n", url.c_str()); fprintf(stderr, "ERROR: url size limit exceeded: %s\n", url.c_str());
return NULL; return NULL;
} }
if (origin.size() >= 200) {
fprintf(stderr, "ERROR: origin size limit exceeded: %s\n", origin.c_str());
return NULL;
}
if (false) { } if (false) { }
else if (sscanf(url.c_str(), "ws://%[^:/]:%d/%s", host, &port, path) == 3) { else if (sscanf(url.c_str(), "ws://%[^:/]:%d/%s", host, &port, path) == 3) {
} }
@@ -426,6 +430,9 @@ easywsclient::WebSocket::pointer from_url(const std::string& url, bool useMask)
} }
snprintf(line, 256, "Upgrade: websocket\r\n"); ::send(sockfd, line, strlen(line), 0); snprintf(line, 256, "Upgrade: websocket\r\n"); ::send(sockfd, line, strlen(line), 0);
snprintf(line, 256, "Connection: Upgrade\r\n"); ::send(sockfd, line, strlen(line), 0); snprintf(line, 256, "Connection: Upgrade\r\n"); ::send(sockfd, line, strlen(line), 0);
if (!origin.empty()) {
snprintf(line, 256, "Origin: %s\r\n", origin.c_str()); ::send(sockfd, line, strlen(line), 0);
}
snprintf(line, 256, "Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n"); ::send(sockfd, line, strlen(line), 0); snprintf(line, 256, "Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n"); ::send(sockfd, line, strlen(line), 0);
snprintf(line, 256, "Sec-WebSocket-Version: 13\r\n"); ::send(sockfd, line, strlen(line), 0); snprintf(line, 256, "Sec-WebSocket-Version: 13\r\n"); ::send(sockfd, line, strlen(line), 0);
snprintf(line, 256, "\r\n"); ::send(sockfd, line, strlen(line), 0); snprintf(line, 256, "\r\n"); ::send(sockfd, line, strlen(line), 0);
@@ -463,12 +470,12 @@ WebSocket::pointer WebSocket::create_dummy() {
} }
WebSocket::pointer WebSocket::from_url(const std::string& url) { WebSocket::pointer WebSocket::from_url(const std::string& url, const std::string& origin) {
return ::from_url(url, true); return ::from_url(url, true, origin);
} }
WebSocket::pointer WebSocket::from_url_no_mask(const std::string& url) { WebSocket::pointer WebSocket::from_url_no_mask(const std::string& url, const std::string& origin) {
return ::from_url(url, false); return ::from_url(url, false, origin);
} }
easywsclient.hpp
+2 -2
View File
@@ -19,8 +19,8 @@ class WebSocket {
// Factories: // Factories:
static pointer create_dummy(); static pointer create_dummy();
static pointer from_url(const std::string& url); static pointer from_url(const std::string& url, const std::string& origin = std::string());
static pointer from_url_no_mask(const std::string& url); static pointer from_url_no_mask(const std::string& url, const std::string& origin = std::string());
// Interfaces: // Interfaces:
virtual ~WebSocket() { } virtual ~WebSocket() { }