[Orxonox-commit 2969] r7668 - code/branches/masterserver/src/libraries/network
dafrick at orxonox.net
dafrick at orxonox.net
Wed Nov 24 17:12:50 CET 2010
Author: dafrick
Date: 2010-11-24 17:12:49 +0100 (Wed, 24 Nov 2010)
New Revision: 7668
Modified:
code/branches/masterserver/src/libraries/network/MasterServerComm.cc
Log:
fix this...
Modified: code/branches/masterserver/src/libraries/network/MasterServerComm.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/MasterServerComm.cc 2010-11-24 16:12:36 UTC (rev 7667)
+++ code/branches/masterserver/src/libraries/network/MasterServerComm.cc 2010-11-24 16:12:49 UTC (rev 7668)
@@ -105,7 +105,10 @@
int MasterServerComm::pollForReply( int (*callback)( char*, ENetEvent* ) )
{
/* see whether anything happened */
- if( enet_host_service( this->client, &this->event, 100 ) >= 0 )
+ /* WORK MARK REMOVE THIS OUTPUT */
+ COUT(2) << "MARK polling...\n";
+
+ if( enet_host_service( this->client, &this->event, 1000 ) >= 0 )
{
/* address buffer */
char *addrconv = NULL;
@@ -148,7 +151,7 @@
}
/* show that no event occured */
- return 1;
+ return 0;
}
int MasterServerComm::sendRequest( char *data )
@@ -164,6 +167,7 @@
/* One could just use enet_host_service() instead. */
enet_host_flush( this->client );
+
if( packet ) free( packet );
/* all done. */
More information about the Orxonox-commit
mailing list