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

Ported bugfix to win32

Browse Source
This commit is contained in:
Mark Vejvoda
2010-04-12 21:54:47 +00:00
parent a5aba5cc66
commit 2c9b6ea3ee
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/shared_lib/include/platform/win32/socket.h
View File

@@ -99,7 +99,6 @@ public:
protected: protected:
static void throwException(const string &str); static void throwException(const string &str);
}; };
class BroadCastClientSocketThread : public Thread class BroadCastClientSocketThread : public Thread
@@ -124,7 +123,6 @@ public:
bool getRunningStatus(); bool getRunningStatus();
}; };
// ===================================================== // =====================================================
// class ClientSocket // class ClientSocket
// ===================================================== // =====================================================
@@ -133,9 +131,8 @@ class ClientSocket: public Socket{
public: public:
ClientSocket(); ClientSocket();
virtual ~ClientSocket(); virtual ~ClientSocket();
void connect(const Ip &ip, int port); void connect(const Ip &ip, int port);
static std::vector<string> discoverServers();
static void discoverServers(DiscoveredServersInterface *cb); static void discoverServers(DiscoveredServersInterface *cb);
static void stopBroadCastClientThread(); static void stopBroadCastClientThread();
@@ -171,11 +168,9 @@ public:
// ===================================================== // =====================================================
class ServerSocket: public Socket{ class ServerSocket: public Socket{
public: public:
ServerSocket(); ServerSocket();
virtual ~ServerSocket(); virtual ~ServerSocket();
void bind(int port); void bind(int port);
void listen(int connectionQueueSize= SOMAXCONN); void listen(int connectionQueueSize= SOMAXCONN);
Socket *accept(); Socket *accept();
@@ -185,6 +180,7 @@ protected:
BroadCastSocketThread *broadCastThread; BroadCastSocketThread *broadCastThread;
void startBroadCastThread(); void startBroadCastThread();
bool isBroadCastThreadRunning();
}; };

33
source/shared_lib/sources/platform/win32/socket.cpp
View File

@@ -197,6 +197,7 @@ Ip::Ip(unsigned char byte0, unsigned char byte1, unsigned char byte2, unsigned c
bytes[3]= byte3; bytes[3]= byte3;
} }
Ip::Ip(const string& ipString){ Ip::Ip(const string& ipString){
int offset= 0; int offset= 0;
int byteIndex= 0; int byteIndex= 0;
@@ -244,7 +245,7 @@ static uint32 SockAddrToUint32(struct sockaddr * a)
// convert a numeric IP address into its string representation // convert a numeric IP address into its string representation
static void Inet_NtoA(uint32 addr, char * ipbuf) static void Inet_NtoA(uint32 addr, char * ipbuf)
{ {
sprintf(ipbuf, "%li.%li.%li.%li", (addr>>24)&0xFF, (addr>>16)&0xFF, (addr>>8)&0xFF, (addr>>0)&0xFF); sprintf(ipbuf, "%d.%d.%d.%d", (addr>>24)&0xFF, (addr>>16)&0xFF, (addr>>8)&0xFF, (addr>>0)&0xFF);
} }
// convert a string represenation of an IP address into its numeric equivalent // convert a string represenation of an IP address into its numeric equivalent
@@ -421,7 +422,10 @@ string getNetworkInterfaceBroadcastAddress(string ipAddress)
char ifaAddrStr[32]; Inet_NtoA(ifaAddr, ifaAddrStr); char ifaAddrStr[32]; Inet_NtoA(ifaAddr, ifaAddrStr);
char maskAddrStr[32]; Inet_NtoA(maskAddr, maskAddrStr); char maskAddrStr[32]; Inet_NtoA(maskAddr, maskAddrStr);
char dstAddrStr[32]; Inet_NtoA(dstAddr, dstAddrStr); char dstAddrStr[32]; Inet_NtoA(dstAddr, dstAddrStr);
printf(" Found interface: name=[%s] desc=[%s] address=[%s] netmask=[%s] broadcastAddr=[%s]\n", p->ifa_name, "unavailable", ifaAddrStr, maskAddrStr, dstAddrStr); //printf(" Found interface: name=[%s] desc=[%s] address=[%s] netmask=[%s] broadcastAddr=[%s]\n", p->ifa_name, "unavailable", ifaAddrStr, maskAddrStr, dstAddrStr);
if(strcmp(ifaAddrStr,ipAddress.c_str()) == 0) {
broadCastAddress = dstAddrStr;
}
} }
p = p->ifa_next; p = p->ifa_next;
} }
@@ -1340,7 +1344,7 @@ void ServerSocket::stopBroadCastThread() {
break; break;
} }
sleep(100); sleep(100);
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); //SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
@@ -1362,7 +1366,18 @@ void ServerSocket::startBroadCastThread() {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
void ServerSocket::bind(int port){ bool ServerSocket::isBroadCastThreadRunning() {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
bool isThreadRunning = (broadCastThread != NULL && broadCastThread->getRunningStatus() == true);
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] isThreadRunning = %d\n",__FILE__,__FUNCTION__,__LINE__,isThreadRunning);
return isThreadRunning;
}
void ServerSocket::bind(int port)
{
//sockaddr structure //sockaddr structure
sockaddr_in addr; sockaddr_in addr;
addr.sin_family= AF_INET; addr.sin_family= AF_INET;
@@ -1380,7 +1395,15 @@ void ServerSocket::listen(int connectionQueueSize){
if(err==SOCKET_ERROR){ if(err==SOCKET_ERROR){
throwException("Error listening socket"); throwException("Error listening socket");
} }
startBroadCastThread();
if(connectionQueueSize > 0) {
if(isBroadCastThreadRunning() == false) {
startBroadCastThread();
}
}
else {
stopBroadCastThread();
}
} }
Socket *ServerSocket::accept(){ Socket *ServerSocket::accept(){