Changeset 9470 in orxonox.OLD

Timestamp:

Jul 25, 2006, 10:23:17 PM (18 years ago)

Author:

patrick

Message:

heavy permissions fight: no node was ever thought to be client and server at the same time, proxy server are hybrid nodes so there is need for a big framework extension.

• made the obb creation saver
• prevented segfaults in the aabb tree creation, this was very dangerous code
• inserted handshake hack to make the handshake work.

No I will have to get the handshake right so the node works correctly

Location:

branches/proxy/src

Files:

• lib/collision_detection/aabb_tree_node.cc (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (6 diffs)
• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (8 diffs)
• lib/network/peer_info.cc (modified) (1 diff)
• lib/network/shared_network_data.h (modified) (1 diff)
• util/game_rules.cc (modified) (1 diff)
• util/multiplayer_team_deathmatch.cc (modified) (3 diffs)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (2 diffs)

branches/proxy/src/lib/collision_detection/aabb_tree_node.cc

@@ -66 +66 @@
 {
   this->depth = depth;
+
+  this->init();
 }
 
@@ -87 +89 @@
 
   this->owner = NULL;
-
-  /* debug ids */
-  if( this->nodePrev)
-    this->treeIndex = 100 * this->depth + this->nodePrev->getID();
-  else
-    this->treeIndex = 0;
 }
 

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

@@ -131 +131 @@
 
   // create the network stream af
-  this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE);
+  this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE );
   // first connect to the master server for synchronization
   this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 9999);

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

@@ -208 +208 @@
  * @param port: the port number
  */
-void NetworkStream::connectToProxyServer(int proxyId,std::string host, int port)
+void NetworkStream::connectToProxyServer(int proxyId, std::string host, int port)
 {
   PRINTF(0)("connect to proxy %s, this is proxyId %i\n", host.c_str(), proxyId);
@@ -253 +253 @@
 void NetworkStream::startHandshake(int userId)
 {
-  Handshake* hs = new Handshake(this->pInfo->nodeType);
+  Handshake* hs = new Handshake(NET_CLIENT/* this->pInfo->nodeType*/);
   // fake the unique id
   hs->setUniqueID( NET_UID_HANDSHAKE );
@@ -323 +323 @@
     this->updateConnectionList();
   }
-  else if( this->pInfo->isProxyServerActive())
-  {
+//   else if( this->pInfo->isProxyServerActive())
+//   {
     // execute everything the proxy server should do
-    if ( this->clientSocket )
-      this->clientSocket->update();
-    if( this->proxySocket)
-      this->proxySocket->update();
-
-    this->updateConnectionList();
-  }
+
+//     if ( this->clientSocket )
+//       this->clientSocket->update();
+//     if( this->proxySocket)
+//       this->proxySocket->update();
+//
+//     this->updateConnectionList();
+//   }
   else
   {
@@ -554 +555 @@
           {
             // make sure this is a client
-            if( this->pInfo->isClient())
+            if( this->pInfo->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
             {
               SharedNetworkData::getInstance()->setHostID( it->second.handshake->getHostId() );
@@ -752 +753 @@
 
       // if we are a server (both master and proxy servers) and this is not our handshake
-      if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive() ) && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+      if ( ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ ) && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
         continue;
 
@@ -766 +767 @@
 
       // server fakes uniqueid == 0 for handshake
-      if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive() ) &&
+      if ( ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive() */) &&
              sync.getUniqueID() <= SharedNetworkData::getInstance()->getMaxPlayer() + 1) // plus one to handle one client more than the max to redirect it
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
@@ -818 +819 @@
     // now compress the data with the zip library
     int compLength = 0;
-    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+    if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
       compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictServer );
     else
@@ -936 +937 @@
 
           // if the node we got this unknown sync from is a client we ignore it (since it has no rights to create a new sync)
-          if ( peers[peer->second.userId].isClient() )
+          if ( peers[peer->second.userId].isClient() || peers[peer->second.userId].isProxyServerActive())
           {
             offset += syncDataLength;

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

@@ -58 +58 @@
   return PeerInfo::nodeTypeToString( this->nodeType );
   // the above does the same, and is faster in it. (there is no case where node is uninit i hope!)
-/*
-  switch( this->nodeType)
-  {
-    case NET_CLIENT:
-      return std::string("client");
-    case NET_PROXY_SERVER_ACTIVE:
-      return std::string("proxy server active");
-    case NET_PROXY_SERVER_PASSIVE:
-      return std::string("proxy server passive");
-    case NET_MASTER_SERVER:
-      return std::string("master server");
-  }
-
-  return std::string("node is uninit");*/
 }
 

branches/proxy/src/lib/network/shared_network_data.h

@@ -28 +28 @@
 
     /** @returns the next uniqueID free for an object */
-    inline int getNewUniqueID() { return ( this->nodeType != NET_CLIENT)?this->newUniqueID++:-1; }
+    inline int getNewUniqueID() { return ( isMasterServer())?this->newUniqueID++:-1; }
     /** sets the @param newUniqueID: the new offset for the next unique id */
     inline void setNewUniqueID(int newUniqueID) { this->newUniqueID = newUniqueID; }

branches/proxy/src/util/game_rules.cc

@@ -87 +87 @@
 void GameRules::registerKill(const Kill& kill)
 {
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 

branches/proxy/src/util/multiplayer_team_deathmatch.cc

@@ -152 +152 @@
       box->setAbsCoor2D( 300, 100 );
 
-      if( SharedNetworkData::getInstance()->isClient())
+      if( SharedNetworkData::getInstance()->isClient() ||  SharedNetworkData::getInstance()->isProxyServerActive())
       {
         OrxGui::GLGuiPushButton * buttonSpectator = new OrxGui::GLGuiPushButton("Spectator");
@@ -214 +214 @@
   assignPlayable();
 
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 
@@ -278 +278 @@
 void MultiplayerTeamDeathmatch::checkGameRules()
 {
-  if ( SharedNetworkData::getInstance()->isClient() )
+  if ( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
     return;
 

branches/proxy/src/world_entities/creatures/fps_player.cc

@@ -287 +287 @@
   //dealing damage
 
-  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()))
+  if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
   {
     this->damageTicker -= time;

branches/proxy/src/world_entities/space_ships/space_ship.cc

@@ -310 +310 @@
 void SpaceShip::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  Playable::collidesWith(entity, location);
-
-  if( entity->isA(CL_PROJECTILE) && entity != ref)
-  {
-    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
-    {
-      //TODO handle this
-    }
-  }
-  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
+
 }
 

branches/proxy/src/world_entities/world_entity.cc

@@ -257 +257 @@
 bool WorldEntity::buildObbTree(int depth)
 {
-  if (this->obbTree)
+  if( this->obbTree != NULL)
+  {
     delete this->obbTree;
+    this->obbTree = NULL;
+  }
 
   if (this->models[0] != NULL)
@@ -280 +283 @@
     this->aabbNode = new AABBTreeNode();
     this->aabbNode->spawnBVTree(this->models[0]);
+  }
+  else
+  {
+    PRINTF(1)("could not create aabb bounding box, because no model was loaded yet\n");
+    this->aabbNode = NULL;
+    return false;
   }
   return true;