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

Correct dependencies in Makefile. Add -Wall flag and fix all -Wall warnings.

Browse Source
This commit is contained in:
David Baird
2013-09-10 12:47:07 -06:00
parent 3cbc9719e9
commit f453367866
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -1
View File
@@ -1,2 +1,5 @@
CXXFLAGS = -std=gnu++0x CXXFLAGS = -std=gnu++0x -Wall
LDLIBS = -lstdc++
all: example-client-cpp11 example-client all: example-client-cpp11 example-client
example-client-cpp11.o: example-client-cpp11.cpp easywsclient.cpp easywsclient.hpp
example-client.o: example-client.cpp easywsclient.cpp easywsclient.hpp
easywsclient.cpp
+3 -3
View File
@@ -89,7 +89,7 @@ struct _RealWebSocket : public WebSocket
+---------------------------------------------------------------+ +---------------------------------------------------------------+
#endif #endif
struct wsheader_type { struct wsheader_type {
int header_size; unsigned header_size;
bool fin; bool fin;
bool mask; bool mask;
enum opcode_type { enum opcode_type {
@@ -313,13 +313,13 @@ WebSocket::pointer WebSocket::from_url(std::string url) {
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);
for (i = 0; i < 2 || i < 255 && line[i-2] != '\r' && line[i-1] != '\n'; ++i) { if (recv(sockfd, line+i, 1, 0) == 0) { return NULL; } } for (i = 0; i < 2 || (i < 255 && line[i-2] != '\r' && line[i-1] != '\n'); ++i) { if (recv(sockfd, line+i, 1, 0) == 0) { return NULL; } }
line[i] = 0; line[i] = 0;
if (i == 255) { fprintf(stderr, "ERROR: Got invalid status line connecting to: %s\n", url.c_str()); return NULL; } if (i == 255) { fprintf(stderr, "ERROR: Got invalid status line connecting to: %s\n", url.c_str()); return NULL; }
if (sscanf(line, "HTTP/1.1 %d", &status) != 1 || status != 101) { fprintf(stderr, "ERROR: Got bad status connecting to %s: %s", url.c_str(), line); return NULL; } if (sscanf(line, "HTTP/1.1 %d", &status) != 1 || status != 101) { fprintf(stderr, "ERROR: Got bad status connecting to %s: %s", url.c_str(), line); return NULL; }
// TODO: verify response headers, // TODO: verify response headers,
while (true) { while (true) {
for (i = 0; i < 2 || i < 255 && line[i-2] != '\r' && line[i-1] != '\n'; ++i) { if (recv(sockfd, line+i, 1, 0) == 0) { return NULL; } } for (i = 0; i < 2 || (i < 255 && line[i-2] != '\r' && line[i-1] != '\n'); ++i) { if (recv(sockfd, line+i, 1, 0) == 0) { return NULL; } }
if (line[0] == '\r' && line[1] == '\n') { break; } if (line[0] == '\r' && line[1] == '\n') { break; }
} }
} }