Changeset 9653 in orxonox.OLD

Timestamp:

Aug 1, 2006, 12:39:03 AM (18 years ago)

Author:

patrick

Message:

some more smaller works:

• fixed a bug preventing clients/proxies to connect to server
• started an implementation of a soft-reconnection
• fixed a bug preventing more than one proxy to connect to a ms

Location:

branches/proxy/src/lib/network

Files:

• message_manager.cc (modified) (2 diffs)
• network_manager.cc (modified) (3 diffs)
• network_manager.h (modified) (1 diff)
• network_stream.cc (modified) (5 diffs)
• network_stream.h (modified) (4 diffs)
• synchronizeable.cc (modified) (2 diffs)
• udp_socket.h (modified) (2 diffs)

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

@@ -239 +239 @@
       outgoingMessageQueue[userId].toAck.push_back( number );
 
+//     PRINTF(0)("got message with type: %i\n", messageType);
     assert( i + messageLength <= length );
     // make sure there is a message handler for this message type
-    assert( messageHandlerMap.find( (MessageType)messageType ) == messageHandlerMap.end());
+    assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());
 
 
@@ -453 +454 @@
          recieverType == RT_ALL_BUT_ME  ||
          recieverType == RT_USER        && it->first == reciever ||
-        recieverType == RT_USER        && reciever == NET_ID_MASTER_SERVER && !getNetworkStream()->isUserMasterServer( it->first ) ||  // special case: forward
+         recieverType == RT_USER        && reciever == NET_ID_MASTER_SERVER && !getNetworkStream()->isUserMasterServer( it->first ) ||  //(*)
          recieverType == RT_NOT_USER    && it->first != reciever ||
          recieverType == RT_SERVER      && getNetworkStream()->isUserMasterServer( it->first ) ||
          recieverType == RT_SERVER      && getNetworkStream()->isUserProxyServerActive( it->first )
-       )
+       )// (*) special case: forward
     {
       NetworkMessage msg;

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

@@ -38 +38 @@
 
 SHELL_COMMAND(debug, NetworkManager, debug);
+SHELL_COMMAND(redirTest, NetworkManager, setRedirectionTest);
+
 
 
@@ -142 +144 @@
 
   // then start the server
-//   this->networkStream->createServer( port, port + 1, port + 2);
+  this->networkStream->createServer( port, port + 1, port + 2);
 
   // and to the other proxy servers also, this would be very nice if its works
@@ -232 +234 @@
   PRINT(0)("===========================================\n");
 }
+
+
+void NetworkManager::setRedirectionTest()
+{
+  this->networkStream->setRedirectionTest();
+}

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

@@ -46 +46 @@
     void debug();
 
+    void setRedirectionTest();
+
+
 
   private:

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

@@ -390 +390 @@
   this->handleDownstream( tick );
   this->handleUpstream( tick );
+
+  if( this->bSoftRedirect)
+    this->softReconnectToServer(0, IP("localhost", 10001));
 }
 
@@ -481 +484 @@
         userId = 1;
 
+        // find an empty slot within the range
         for( int i = 0; i < NET_ID_PROXY_MAX; i++)
         {
-          if( this->peers.find( i) != this->peers.end())
+          if( this->peers.find( i) == this->peers.end())
+          {
             userId = i;
-          break;
+            break;
+          }
         }
-        userId++;
 
 //         for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
@@ -832 +837 @@
 /**
  * softly reconnecting to another server
+ * @param serverUserId the id of the client
  * @param address  of the new server
  */
-void NetworkStream::softReconnectToServer(IP address)
-{
-  this->networkMonitor->setForcedReconnection(address);
-  this->handleReconnect( NET_ID_MASTER_SERVER);
+void NetworkStream::softReconnectToServer(int serverUserId, IP address)
+{
+//   this->networkMonitor->setForcedReconnection(address);
+//   this->handleReconnect( NET_ID_MASTER_SERVER);
+
+  // create the new udp socket and open the connection to the soft connection port
+  NetworkSocket* newSocket = new UdpSocket(address.ipString(), 10001);
+
+  // delete the synchronization state of this client for all syncs
+  for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )  {
+    (*it2)->cleanUpUser( serverUserId );
+  }
+
+  // temp save the old socket
+  NetworkSocket* oldSocket = this->peers[serverUserId].socket;
+
+  // now integrate the new socket
+  this->peers[serverUserId].socket = newSocket;
+
+  return;
+
+  // now remove the old socket
+  oldSocket->disconnectServer();
+  delete oldSocket;
+
+  // replace the old connection monitor
+  if ( this->peers[serverUserId].connectionMonitor )
+    delete this->peers[serverUserId].connectionMonitor;
+  this->peers[serverUserId].connectionMonitor = new ConnectionMonitor(serverUserId);
+
+  // remove old node from the network monitor
+  this->networkMonitor->removeNode(&this->peers[serverUserId]);
+
+  this->bSoftRedirect = false;
 }
 
@@ -859 +895 @@
   this->peers[userId].connectionMonitor = NULL;
 
-
+  // delete the synchronization state of this client for all syncs
   for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )  {
     (*it2)->cleanUpUser( userId );
@@ -872 +908 @@
   this->peers.erase( userId);
 }
-
 
 

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

@@ -50 +50 @@
 
     void reconnectToServer(IP address);
-    void softReconnectToServer(IP address);
+    void softReconnectToServer(int serverUserId, IP address);
 
 
@@ -75 +75 @@
     inline PeerInfo* getPeerInfo() { return this->pInfo; }
     inline PeerList getPeerInfoList() { return this->peers; }
+
+    inline void setRedirectionTest() { this->bSoftRedirect = true; }
 
     /* data processing*/
@@ -104 +106 @@
     void handleReconnect( int userId );
     void handleDisconnect( int userId );
+    void handleSoftDisconnect( int userId);
 
     void writeToNewDict( byte * data, int length, bool upstream );
@@ -134 +137 @@
     bool                       bRedirect;                   //!< true if the master server sent a redirect command
     int                        redirectionUID;              //!< uid of the redir host
+    bool                       bSoftRedirect;               //!< tsting
 };
 #endif /* _NETWORK_STREAM */

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

@@ -126 +126 @@
 int Synchronizeable::getStateDiff( int userId, byte* data, int maxLength, int stateId, int fromStateId, int priorityTH )
 {
-  //make sure this user has his history
+  // make sure this user has his history or resize for new clients
   if ( (int)sentStates.size() <= userId )
     sentStates.resize( userId+1 );
@@ -133 +133 @@
   int neededSize = 0;
 
+  // calculate the needed space for network packet by summing up
   for ( SyncVarList::iterator it = syncVarList.begin(); it != syncVarList.end(); it++ )
   {

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

@@ -41 +41 @@
 
   private:
+    void init();
+
+    bool writeRawPacket( byte * data, int length );
+    bool checkUdpCmd( byte udpCmd );
+    bool checkRandomByte( byte rndByte );
+    byte generateNewRandomByte();
+
+
+  private:
     UdpServerSocket * serverSocket;   //!< will get packets here
     int               userId;         //!< user id used by serverSocket
@@ -47 +56 @@
 
     byte              randomByte;     //!< contains random bytes & 0xFC
-
-    bool writeRawPacket( byte * data, int length );
-    bool checkUdpCmd( byte udpCmd );
-    bool checkRandomByte( byte rndByte );
-    byte generateNewRandomByte();
-
-    void init();
-
 };