Changeset 9436 in orxonox.OLD

Timestamp:

Jul 24, 2006, 4:50:38 PM (18 years ago)

Author:

patrick

Message:

the server does not segfault anymore on client disconnect, but the client does

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (5 diffs)

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

@@ -447 +447 @@
 #warning this is some more disconnct handling, consider doing it in the handleDisconnect() funciton
       // and cleanup the user infos
-      for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )
-      {
-        (*it2)->cleanUpUser( it->second.userId );
-      }
-
-      NetworkGameManager::getInstance()->signalLeftPlayer(it->second.userId);
-
-      freeSocketSlots.push_back( it->second.userId );
-
-      PeerList::iterator delit = it;
+//       for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )
+//       {
+//         (*it2)->cleanUpUser( it->second.userId );
+//       }
+//
+//       NetworkGameManager::getInstance()->signalLeftPlayer(it->second.userId);
+//
+//       freeSocketSlots.push_back( it->second.userId );
+
+//       PeerList::iterator delit = it;
       it++;
 
-      peers.erase( delit );
+//       peers.erase( delit );
 
       continue;
@@ -610 +610 @@
     }
   }
-
-
-//   for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
-//   {
-//     if( !it->second.handshake->redirect())
-//     {
-//       if( SharedNetworkData::getInstance()->isClient())
-//       {
-//         this->handleReconnect( it->second.userId);
-//         return;
-//       }
-//     }
-//   }
 }
 
@@ -640 +627 @@
   PRINTF(0)("===============================================\n");
 
-  // reject the server
-//   pInfo->handshake->doReject( "redirected to different server");
-//   pInfo->handshake->del();
-
   // flush the old synchronization states, since the numbering could be completely different
   pInfo->lastAckedState = 0;
@@ -654 +637 @@
 //   pInfo->socket->reconnectToServer( proxyIP.ipString(), proxyIP.port());
   this->handleDisconnect( userId);
-//   this->connectToProxyServer(proxyIP.ipString(), 9999);
+  this->connectToProxyServer(proxyIP.ipString(), 9999);
 #warning the ports are not yet integrated correctly in the ip class
 
@@ -684 +667 @@
     (*it2)->cleanUpUser( userId );
   }
-//
-// //   NetworkGameManager::getInstance()->signalLeftPlayer(userId);
-//
-//   this->freeSocketSlots.push_back( userId );
-//
-//   peers.erase( userId );
+
+  if( SharedNetworkData::getInstance()->isMasterServer())
+    NetworkGameManager::getInstance()->signalLeftPlayer(userId);
+
+  this->freeSocketSlots.push_back( userId );
+
+  peers.erase( userId );
 
 //   this->pInfo->userId = 0;