Changeset 9476 in orxonox.OLD

Timestamp:

Jul 25, 2006, 11:35:11 PM (18 years ago)

Author:

patrick

Message:

now the clients can connect to the proxy servers.

⇒ hybrid proxy servers are half way done. There is still one major problem:

NetworkGameManager
This class is not yet hybrid at all. I will have take some more time for this one…

Location:

branches/proxy/src

Files:

• lib/network/network_game_manager.cc (modified) (6 diffs)
• lib/network/network_manager.cc (modified) (2 diffs)
• lib/network/network_stream.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (4 diffs)

branches/proxy/src/lib/network/network_game_manager.cc

@@ -91 +91 @@
 bool NetworkGameManager::signalNewPlayer( int userId )
 {
-  assert( SharedNetworkData::getInstance()->isMasterServer() /*||  SharedNetworkData::getInstance()->isProxyServerActive()*/);
+  assert( SharedNetworkData::getInstance()->isMasterServer() ||  SharedNetworkData::getInstance()->isProxyServerActive());
   assert( State::getGameRules() );
   assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );
@@ -168 +168 @@
 bool NetworkGameManager::delSynchronizeableHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() /*||  SharedNetworkData::getInstance()->isProxyServerActive()*/)
+  if ( SharedNetworkData::getInstance()->isMasterServer() ||  SharedNetworkData::getInstance()->isProxyServerActive())
   {
     PRINTF(2)("Recieved DeleteSynchronizeable message from client %d!\n", userId);
@@ -229 +229 @@
 bool NetworkGameManager::preferedTeamHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
 {
-  assert( SharedNetworkData::getInstance()->isMasterServer() /*||  SharedNetworkData::getInstance()->isProxyServerActive()*/);
+  assert( SharedNetworkData::getInstance()->isMasterServer() ||  SharedNetworkData::getInstance()->isProxyServerActive());
 
   int teamId = 0;
@@ -261 +261 @@
 void NetworkGameManager::prefereTeam( int teamId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
+  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
   else
@@ -305 +305 @@
 {
   PRINTF(0)("NetworkGameManager::chatMessageHandler %d %d\n", userId, SharedNetworkData::getInstance()->getHostID() );
-  if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/) && userId !=  SharedNetworkData::getInstance()->getHostID() )
+  if ( (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()) && userId !=  SharedNetworkData::getInstance()->getHostID() )
   {
     MessageManager::getInstance()->sendMessage( messageId, data, dataLength, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
@@ -347 +347 @@
   assert( Converter::stringToByteArray(message, buf+2*INTSIZE, message.length()+INTSIZE) == message.length()+INTSIZE );
 
-  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
+  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
   else

branches/proxy/src/lib/network/network_manager.cc

@@ -133 +133 @@
   this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE );
   // first connect to the master server for synchronization
-  this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 10000);
+//   this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 10000);
   // start the handshake with the master server
-  this->networkStream->startHandshake(NET_ID_MASTER_SERVER);
+//   this->networkStream->startHandshake(NET_ID_MASTER_SERVER);
 
 
@@ -146 +146 @@
 
   // start the network game manager
-//   this->networkStream->createNetworkGameManager();
+   this->networkStream->createNetworkGameManager();
 
 

branches/proxy/src/lib/network/network_stream.cc

@@ -228 +228 @@
 void NetworkStream::createServer(int clientPort, int proxyPort)
 {
-  this->proxySocket = new UdpServerSocket(clientPort);
-  this->clientSocket= new UdpServerSocket(proxyPort);
+  PRINTF(0)(" Creating new Server: listening for clients on port %i and for proxies on port %i", clientPort, proxyPort);
+  this->clientSocket= new UdpServerSocket(clientPort);
+  this->proxySocket = new UdpServerSocket(proxyPort);
 }
 

branches/proxy/src/story_entities/multi_player_world_data.cc

@@ -112 +112 @@
   const TiXmlElement* element = NULL;
 
-  if( SharedNetworkData::getInstance()->isMasterServer())
+  if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
   {
     /* load the spawning points */
@@ -148 +148 @@
     element = element->FirstChildElement();
 
-    if( SharedNetworkData::getInstance()->isMasterServer() )
+    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     {
       while( element != NULL)
@@ -206 +206 @@
 
 
-    if( SharedNetworkData::getInstance()->isMasterServer())
+    if( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
     {
       this->localPlayer = new Player();
@@ -284 +284 @@
 
   // create server playable
-  if ( SharedNetworkData::getInstance()->isMasterServer())
+  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
   {
     NetworkGameManager::getInstance()->signalNewPlayer( 0 );