Changeset 9255 in orxonox.OLD

Timestamp:

Jul 12, 2006, 2:05:42 PM (18 years ago)

Author:

patrick

Message:

saver state handling and first proxy clause

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (4 diffs)
• network_stream.h (modified) (1 diff)

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

@@ -92 +92 @@
   this->init();
   this->serverSocket = new UdpServerSocket(port);
-//   this->bActive = true;
 }
 
@@ -103 +102 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
-//   this->bActive = false;
   this->serverSocket = NULL;
   this->networkGameManager = NULL;
@@ -223 +221 @@
   int tick = SDL_GetTicks();
 
-  currentState++;
+  this->currentState++;
+  // there was a wrap around
+  if( this->currentState < 0)
+  {
+    PRINTF(1)("A wrap around in the state variable as occured. The server was running so long? Pls restart server or write a mail to the supporters!\n");
+  }
 
   if ( this->type == NET_MASTER_SERVER )
   {
+    // execute everytthing the master server shoudl do
     if ( serverSocket )
       serverSocket->update();
 
     this->updateConnectionList();
+  }
+  else if( this->type == NET_PROXY_SERVER)
+  {
+    // execute everything the proxy server should do
   }
   else
@@ -643 +651 @@
       assert( Converter::byteArrayToInt( buf + 2*INTSIZE, &fromState ) == INTSIZE );
       assert( Converter::byteArrayToInt( buf + 3*INTSIZE, &ackedState ) == INTSIZE );
-      //NETPRINTF(n)("ackedstate: %d\n", ackedState);
       offset = 4*INTSIZE;
 
       peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, packetLength, state, ackedState );
 
-      //NETPRINTF(n)("got packet: %d, %d\n", length, packetLength);
-
-    //if this is an old state drop it
+
+      //if this is an old state drop it
       if ( state <= peer->second.lastRecvedState )
         continue;

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

@@ -87 +87 @@
     int                        type;                        //!< the type of this host (NET_CLIENT, NET_MASTER_SERVER,...)
     int                        myHostId;                    //!< the host id of the localhost
-/*    bool                       bActive;  */                   //!< true if this host is active
 
     std::list<int>             freeSocketSlots;             //!< list of free sockets (to ensure not to resycle sockets)