nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

watch sockets for error as well in connect

Browse Source
This commit is contained in:
john30
2018-04-04 17:51:13 +02:00
parent 230abbb9fb
commit 8badc83b05
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utils/tcpsocket.cpp
+10 -2
View File
@@ -98,11 +98,19 @@ TCPSocket* TCPClient::connect(const string& server, const uint16_t& port, int ti
fds[0].fd = sfd; fds[0].fd = sfd;
fds[0].events = POLLIN|POLLOUT; fds[0].events = POLLIN|POLLOUT;
ret = ppoll(fds, nfds, &tdiff, NULL); ret = ppoll(fds, nfds, &tdiff, NULL);
if (ret >= 1 && fds[0].revents & POLLERR) {
ret = -1;
}
#else #else
fd_set readfds, writefds; fd_set readfds, writefds, exceptfds;
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_ZERO(&exceptfds);
FD_SET(sfd, &readfds); FD_SET(sfd, &readfds);
ret = pselect(sfd + 1, &readfds, &writefds, NULL, &tdiff, NULL); ret = pselect(sfd + 1, &readfds, &writefds, &errfds , &tdiff, NULL);
if (ret >= 1 && FD_ISSET(sfd, &exceptfds)) {
ret = -1;
}
#endif #endif
if (ret == -1 || ret == 0) { if (ret == -1 || ret == 0) {
close(sfd); close(sfd);