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

Add send/receive error handling

Browse Source
This commit is contained in:
Donald Pillou
2013-12-30 16:32:35 +01:00
parent b0366105c5
commit c5917f913e
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easywsclient.cpp
+23 -5
View File
@@ -37,6 +37,9 @@
typedef __int64 int64_t; typedef __int64 int64_t;
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
#endif #endif
#define socketerrno WSAGetLastError()
#define SOCKET_EAGAIN_EINPROGRESS WSAEINPROGRESS
#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK
#else #else
#include <fcntl.h> #include <fcntl.h>
#include <netdb.h> #include <netdb.h>
@@ -60,6 +63,10 @@
#define SOCKET_ERROR (-1) #define SOCKET_ERROR (-1)
#endif #endif
#define closesocket(s) ::close(s) #define closesocket(s) ::close(s)
#include <errno.h>
#define socketerrno errno
#define SOCKET_EAGAIN_EINPROGRESS EAGAIN
#define SOCKET_EWOULDBLOCK EWOULDBLOCK
#endif #endif
#include <vector> #include <vector>
@@ -191,15 +198,15 @@ class _RealWebSocket : public easywsclient::WebSocket
rxbuf.resize(N + 1500); rxbuf.resize(N + 1500);
ret = recv(sockfd, (char*)&rxbuf[0] + N, 1500, 0); ret = recv(sockfd, (char*)&rxbuf[0] + N, 1500, 0);
if (false) { } if (false) { }
else if (ret < 0) { else if (ret < 0 && (socketerrno == SOCKET_EWOULDBLOCK || socketerrno == SOCKET_EAGAIN_EINPROGRESS)) {
rxbuf.resize(N); rxbuf.resize(N);
break; break;
} }
else if (ret == 0) { else if (ret <= 0) {
rxbuf.resize(N); rxbuf.resize(N);
closesocket(sockfd); closesocket(sockfd);
readyState = CLOSED; readyState = CLOSED;
fprintf(stderr, "Connection closed!\n"); fputs(ret < 0 ? "Connection error!\n" : "Connection closed!\n", stderr);
break; break;
} }
else { else {
@@ -208,8 +215,19 @@ class _RealWebSocket : public easywsclient::WebSocket
} }
while (txbuf.size()) { while (txbuf.size()) {
int ret = ::send(sockfd, (char*)&txbuf[0], txbuf.size(), 0); int ret = ::send(sockfd, (char*)&txbuf[0], txbuf.size(), 0);
if (ret > 0) { txbuf.erase(txbuf.begin(), txbuf.begin() + ret); } if (false) { } // ??
else { break; } else if (ret < 0 && (socketerrno == SOCKET_EWOULDBLOCK || socketerrno == SOCKET_EAGAIN_EINPROGRESS)) {
break;
}
else if (ret <= 0) {
closesocket(sockfd);
readyState = CLOSED;
fputs(ret < 0 ? "Connection error!\n" : "Connection closed!\n", stderr);
break;
}
else {
txbuf.erase(txbuf.begin(), txbuf.begin() + ret);
}
} }
if (!txbuf.size() && readyState == CLOSING) { if (!txbuf.size() && readyState == CLOSING) {
closesocket(sockfd); closesocket(sockfd);