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

- cleanup some socket issues and also a possible int overflow

Browse Source
This commit is contained in:
SoftCoder
2013-12-24 22:44:46 -08:00
parent 3111b733e2
commit f06d474b60
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/platform/common/platform_common.h
View File

@@ -122,7 +122,7 @@ private:
Uint32 lastStartCount; Uint32 lastStartCount;
Uint32 lastTickCount; Uint32 lastTickCount;
int32 lastResult; int64 lastResult;
int32 lastMultiplier; int32 lastMultiplier;
bool lastStopped; bool lastStopped;

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

@@ -966,7 +966,7 @@ void Socket::disconnectSocket() {
::shutdown(sock,2); ::shutdown(sock,2);
#ifndef WIN32 #ifndef WIN32
::close(sock); ::close(sock);
sock = INVALID_SOCKET; sock = -1;
#else #else
::closesocket(sock); ::closesocket(sock);
sock = INVALID_SOCKET; sock = INVALID_SOCKET;
@@ -2148,7 +2148,7 @@ void BroadCastClientSocketThread::execute() {
#ifndef WIN32 #ifndef WIN32
if(bcfd >= 0) ::close(bcfd); if(bcfd >= 0) ::close(bcfd);
bcfd = INVALID_SOCKET; bcfd = -1;
#else #else
if(bcfd >= 0) ::closesocket(bcfd); if(bcfd >= 0) ::closesocket(bcfd);
bcfd = INVALID_SOCKET; bcfd = INVALID_SOCKET;
@@ -2431,7 +2431,7 @@ Socket *ServerSocket::accept(bool errorOnFail) {
else { else {
#ifndef WIN32 #ifndef WIN32
::close(newSock); ::close(newSock);
newSock = INVALID_SOCKET; newSock = -1;
#else #else
::closesocket(newSock); ::closesocket(newSock);
newSock = INVALID_SOCKET; newSock = INVALID_SOCKET;
@@ -2450,7 +2450,7 @@ Socket *ServerSocket::accept(bool errorOnFail) {
#ifndef WIN32 #ifndef WIN32
::close(newSock); ::close(newSock);
newSock = INVALID_SOCKET; newSock = -1;
#else #else
::closesocket(newSock); ::closesocket(newSock);
newSock = INVALID_SOCKET; newSock = INVALID_SOCKET;
@@ -2871,7 +2871,7 @@ void BroadCastSocketThread::execute() {
#ifdef WIN32 #ifdef WIN32
bcfd[idx] = INVALID_SOCKET; bcfd[idx] = INVALID_SOCKET;
#else #else
bcfd[idx] = INVALID_SOCKET; bcfd[idx] = -1;
#endif #endif
} }
/* get my host name */ /* get my host name */
@@ -2905,7 +2905,7 @@ void BroadCastSocketThread::execute() {
#ifdef WIN32 #ifdef WIN32
bcfd[idx] = INVALID_SOCKET; bcfd[idx] = INVALID_SOCKET;
#else #else
bcfd[idx] = INVALID_SOCKET; bcfd[idx] = -1;
#endif #endif
//if(strlen(subnetmask[idx]) > 0) { //if(strlen(subnetmask[idx]) > 0) {
bcfd[idx] = socket( AF_INET, SOCK_DGRAM, 0 ); bcfd[idx] = socket( AF_INET, SOCK_DGRAM, 0 );
@@ -3003,7 +3003,7 @@ void BroadCastSocketThread::execute() {
if( Socket::isSocketValid(&bcfd[idx]) == true ) { if( Socket::isSocketValid(&bcfd[idx]) == true ) {
#ifndef WIN32 #ifndef WIN32
::close(bcfd[idx]); ::close(bcfd[idx]);
bcfd[idx] = INVALID_SOCKET; bcfd[idx] = -1;
#else #else
::closesocket(bcfd[idx]); ::closesocket(bcfd[idx]);
bcfd[idx] = INVALID_SOCKET; bcfd[idx] = INVALID_SOCKET;