iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Fixed crash when connecting to server with empty/bad address

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3594 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 2d9b9b279e9417b2cba390a7d1a34f05c62608fa
Former-commit-id: 581058d7f055cddd2d58f055809e22d682cc9257
This commit is contained in:
pouillot 2011-05-22 15:26:53 +00:00
parent f88deecb2e
commit 13e86b06c5
1 changed files with 45 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/modules/networking/client.cpp
View file

@ -41,21 +41,18 @@ Client::~Client()
{
ResetNetwork();
SetClient(false);
}
void Client::Disconnect()
{
void Client::Disconnect()
{
m_bConnected = false;
ResetNetwork();
SetClient(false);
}
}
void Client::ResetNetwork()
{
if (m_pClient == NULL)
return;
@ -133,18 +130,18 @@ bool Client::ConnectToServer(const char *pAddress,int port, Driver *pDriver)
m_pClient = NULL;
m_pHost = NULL;
#if (ENET_VERSION >= 0x010300)
m_pClient = enet_host_create (NULL /* create a client host */,
MAXNETWORKPLAYERS,
0, /*channel limit*/
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#else
m_pClient = enet_host_create (NULL /* create a client host */,
MAXNETWORKPLAYERS,
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#endif
#if (ENET_VERSION >= 0x010300)
m_pClient = enet_host_create (NULL /* create a client host */,
MAXNETWORKPLAYERS,
0, /*channel limit*/
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#else
m_pClient = enet_host_create (NULL /* create a client host */,
MAXNETWORKPLAYERS,
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#endif
if (m_pClient == NULL)
{
@ -155,36 +152,37 @@ bool Client::ConnectToServer(const char *pAddress,int port, Driver *pDriver)
ENetAddress caddress;
caddress.host = ENET_HOST_ANY;
/* Bind the server to port*/
caddress.port = SPEEDDREAMSPEERPORT;
#if (ENET_VERSION >= 0x010300)
m_pHost = enet_host_create (&caddress /* create a peer host */,
MAXNETWORKPLAYERS,
0, /*channel limit*/
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#else
m_pHost = enet_host_create (&caddress /* create a peer host */,
MAXNETWORKPLAYERS,
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#endif
#if (ENET_VERSION >= 0x010300)
m_pHost = enet_host_create (&caddress /* create a peer host */,
MAXNETWORKPLAYERS,
0, /*channel limit*/
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#else
m_pHost = enet_host_create (&caddress /* create a peer host */,
MAXNETWORKPLAYERS,
0/* downstream bandwidth */,
0/* upstream bandwidth */);
#endif
if(m_pHost==NULL)
{
//try the other ports
for (int i=1;i<5;i++)
{
caddress.port++;
#if (ENET_VERSION >= 0x010300)
m_pHost = enet_host_create (&caddress,MAXNETWORKPLAYERS,0,0,0);
#else
m_pHost = enet_host_create (&caddress,MAXNETWORKPLAYERS,0,0);
#endif
if(m_pHost)
break;
}
//try the other ports
for (int i=1;i<5;i++)
{
caddress.port++;
#if (ENET_VERSION >= 0x010300)
m_pHost = enet_host_create (&caddress,MAXNETWORKPLAYERS,0,0,0);
#else
m_pHost = enet_host_create (&caddress,MAXNETWORKPLAYERS,0,0);
#endif
if(m_pHost)
break;
}
if (m_pHost == NULL)
{
@ -200,7 +198,7 @@ bool Client::ConnectToServer(const char *pAddress,int port, Driver *pDriver)
address.port = port;
/* Initiate the connection, allocating the two channels 0 and 1. */
GfLogError ("Initiating network connection to host %s:%d ...\n", pAddress, port);
GfLogError ("Initiating network connection to host '%s:%d' ...\n", pAddress, port);
#if (ENET_VERSION >= 0x010300)
m_pServer = enet_host_connect (m_pClient, & address, 2, 0);
#else
@ -227,6 +225,8 @@ bool Client::ConnectToServer(const char *pAddress,int port, Driver *pDriver)
{
m_bConnected = false;
ResetNetwork();
GfLogError ("Network connection refused.\n");
return false;
}
m_eClientAccepted = PROCESSINGCLIENT;
@ -235,9 +235,7 @@ bool Client::ConnectToServer(const char *pAddress,int port, Driver *pDriver)
//Wait for server to accept or reject
GfLogInfo ("Sent local driver info to the network server : waiting ...\n");
while(m_eClientAccepted == PROCESSINGCLIENT)
{
SDL_Delay(50);
}
if (m_eClientAccepted == CLIENTREJECTED)
{