From 50c2d0e18de01a78fbd83500aad33a6977162c00 Mon Sep 17 00:00:00 2001 From: David Baird Date: Tue, 14 May 2013 11:11:07 -0600 Subject: [PATCH] * Switching from char to uint8_t * Adding sockfd to ::close() --- easywsclient.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easywsclient.cpp b/easywsclient.cpp index c7e089b..fae870d 100644 --- a/easywsclient.cpp +++ b/easywsclient.cpp @@ -105,8 +105,8 @@ struct _RealWebSocket : public WebSocket uint8_t masking_key[4]; }; - std::vector rxbuf; - std::vector txbuf; + std::vector rxbuf; + std::vector txbuf; int sockfd; readyStateValues readyState; @@ -149,7 +149,7 @@ struct _RealWebSocket : public WebSocket else { break; } } if (!txbuf.size() && readyState == CLOSING) { - ::close(); + ::close(sockfd); readyState = CLOSED; } } @@ -257,8 +257,8 @@ struct _RealWebSocket : public WebSocket void close() { if(readyState == CLOSING || readyState == CLOSED) { return; } readyState = CLOSING; - char closeFrame[4] = {0x88, 0x00, 0x00, 0x00}; - std::vector header(closeFrame, closeFrame+4); + uint8_t closeFrame[4] = {0x88, 0x00, 0x00, 0x00}; + std::vector header(closeFrame, closeFrame+4); txbuf.insert(txbuf.end(), header.begin(), header.end()); }