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

removed vexatious line

Browse Source
This commit is contained in:
Pasquale Boemio
2013-04-29 17:32:05 +02:00
parent 370a899876
commit b9a6eb362e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easywsclient.cpp
+4 -4
View File
@@ -211,7 +211,7 @@ struct _RealWebSocket : public WebSocket
else if (ws.opcode == wsheader_type::PING) { } else if (ws.opcode == wsheader_type::PING) { }
else if (ws.opcode == wsheader_type::PONG) { } else if (ws.opcode == wsheader_type::PONG) { }
else if (ws.opcode == wsheader_type::CLOSE) { else if (ws.opcode == wsheader_type::CLOSE) {
if(clientStatus!=CLOSING) { close(); } if(clientStatus != CLOSING) { close(); }
::close(sockfd); ::close(sockfd);
clientStatus = CLOSE; clientStatus = CLOSE;
fprintf(stderr, "Connection closed!\n"); fprintf(stderr, "Connection closed!\n");
@@ -224,7 +224,7 @@ struct _RealWebSocket : public WebSocket
void send(std::string message) { void send(std::string message) {
// TODO: consider acquiring a lock on txbuf... // TODO: consider acquiring a lock on txbuf...
if(clientStatus==CLOSING || clientStatus==CLOSE) { return; } if(clientStatus == CLOSING || clientStatus == CLOSE) { return; }
std::vector<uint8_t> header; std::vector<uint8_t> header;
header.assign(2 + (message.size() >= 126 ? 2 : 0) + (message.size() >= 65536 ? 6 : 0), 0); header.assign(2 + (message.size() >= 126 ? 2 : 0) + (message.size() >= 65536 ? 6 : 0), 0);
header[0] = 0x80 | wsheader_type::TEXT_FRAME; header[0] = 0x80 | wsheader_type::TEXT_FRAME;
@@ -253,8 +253,8 @@ struct _RealWebSocket : public WebSocket
} }
void close() { void close() {
if(clientStatus==CLOSING || clientStatus==CLOSE) { return; } if(clientStatus == CLOSING || clientStatus == CLOSE) { return; }
clientStatus=CLOSING; clientStatus = CLOSING;
char closeFrame[4] = {0x88, 0x00, 0x00, 0x00}; char closeFrame[4] = {0x88, 0x00, 0x00, 0x00};
std::vector<char> header(closeFrame, closeFrame+4); std::vector<char> header(closeFrame, closeFrame+4);
txbuf.insert(txbuf.end(), header.begin(), header.end()); txbuf.insert(txbuf.end(), header.begin(), header.end());