Changeset 9541 in orxonox.OLD for branches/proxy

Timestamp:

Jul 28, 2006, 10:33:34 AM (18 years ago)

Author:

patrick

Message:

discovered a bug in the client id assignement algorithm. corrected. proxy control center should work now. testing

Location:

branches/proxy/src

Files:

• lib/network/message_manager.cc (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• lib/network/player_stats.cc (modified) (1 diff)
• lib/network/proxy/proxy_control.cc (modified) (2 diffs)
• world_entities/spawning_point.cc (modified) (1 diff)

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

@@ -275 +275 @@
       else
       {
-        // forwarding the messages but only if its not a client
-        if( !SharedNetworkData::getInstance()->isClient())
+        // forwarding the messages but only if its a proxy
+        if( /*!SharedNetworkData::getInstance()->isClient()*/ SharedNetworkData::getInstance()->isProxyServerActive())
         {
           PRINTF(0)("===========>> Forwarding Message msg with type: %i, from sender %i, to rec: %i\n", messageType, senderId, destinationId);

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());
   assert( State::getGameRules() );
   assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );

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

@@ -398 +398 @@
         //userId = 1;
         // each server (proxy and master) have an address space for new network nodes of 1000 nodes
-        userId = SharedNetworkData::getInstance()->getHostID() * 1000;
+        userId = SharedNetworkData::getInstance()->getHostID() * 1000 + 1;
 
         for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )

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

@@ -163 +163 @@
   if ( this->playable && userId == SharedNetworkData::getInstance()->getHostID() )
   {
+    PRINTF(0)(">>>>>>>>>>>>>>>>>>>>>> assign playable %i to user %i (localuser)\n\n\n", this->playable->getUniqueID(), userId);
     State::getPlayer()->setPlayable( this->playable );
     // also set the team id

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

@@ -21 +21 @@
 #include "state.h"
 #include "shared_network_data.h"
+#include "network_game_manager.h"
 
 #include "converter.h"
@@ -103 +104 @@
 bool ProxyControl::messageHandlerNewClient( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
-  PRINTF(0)("Got Signal: new player arrived\n");
+  int userId;
+  // body data length correct?
+  if ( dataLength != INTSIZE )
+  {
+    PRINTF(2)("new client message has wrong size: %d\n", dataLength );
+    return true;
+  }
+  // read the userId fromt he message body
+  assert( Converter::byteArrayToInt( data, &userId) == INTSIZE );
+
+  PRINTF(0)("Got Signal: new player arrived with userId: %i\n", userId);
   // part for the master server
   if( SharedNetworkData::getInstance()->isMasterServer())
   {
-
+    // we now create the new player ship and stuff...
+    NetworkGameManager::getInstance()->signalNewPlayer(userId);
   }
   else if(SharedNetworkData::getInstance()->isProxyServerActive())

branches/proxy/src/world_entities/spawning_point.cc

@@ -207 +207 @@
 void SpawningPoint::sendRespawnMessage( int uniqueId )
 {
-#warning this byte array is not being deleted according to valginrd
   byte * buf = new byte[2*INTSIZE];