mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 13:23:59 +02:00
Code Issues Projects Releases Wiki Activity

- added extra check on linux for socket disconnect

Browse Source
This commit is contained in:
Mark Vejvoda
2010-07-09 05:29:42 +00:00
parent ab655162cb
commit 4ba69753f9
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/shared_lib/sources/platform/posix/socket.cpp
View File

@@ -1092,7 +1092,8 @@ bool Socket::isReadable() {
} }
} }
//return (i == 1 && FD_ISSET(sock, &set)); //return (i == 1 && FD_ISSET(sock, &set));
return (i == 1); bool result = (i == 1);
return result;
} }
bool Socket::isWritable(bool waitOnDelayedResponse) { bool Socket::isWritable(bool waitOnDelayedResponse) {
@@ -1153,9 +1154,23 @@ bool Socket::isConnected() {
if(isReadable()) { if(isReadable()) {
char tmp; char tmp;
int err = peek(&tmp, sizeof(tmp)); int err = peek(&tmp, sizeof(tmp));
return (err > 0); if(err <= 0) {
return false;
}
} }
#ifndef WIN32
// Need this extra check for proper linux disconnect checking
struct sockaddr name;
socklen_t namelen = sizeof (name);
int peer_result = getpeername(sock, &name, &namelen);
if(peer_result != 0) {
return false;
}
#endif
//otherwise the socket is connected //otherwise the socket is connected
return true; return true;
} }