Changeset 7767 in orxonox.OLD for branches/network/src/lib/network/network_stream.h

Timestamp:

May 23, 2006, 11:40:29 AM (18 years ago)

Author:

rennerc

Message:

hover registers sync vars. started with connection monitor

File:

• branches/network/src/lib/network/network_stream.h (modified) (3 diffs)

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

@@ -12 +12 @@
 
 #include "data_stream.h"
-#include "network_protocol.h"
 #include "server_socket.h"
 #include "handshake.h"
+#include "connection_monitor.h"
 
 class Synchronizeable;
 class NetworkSocket;
 class ServerSocket;
-class ConnectionMonitor;
-class NetworkProtocol;
 class NetworkGameManager;
 
@@ -27 +25 @@
   public:
     PeerInfo() { clear(); }
-    void clear() { userId = 0; isServer = false; socket = NULL; handshake = NULL; lastAckedState = 0; lastRecvedState = 0; }
-    int               userId;
-    bool              isServer;
-    NetworkSocket *   socket;
-    Handshake *       handshake;
-    int               lastAckedState;
-    int               lastRecvedState;
-    std::map<int,int> sentStateTicks;
-    std::list<int>    ackDelay;
-    int               ping;
+    void clear() { userId = 0; isServer = false; socket = NULL; handshake = NULL; lastAckedState = 0; lastRecvedState = 0; connectionMonitor = NULL; }
+    int                 userId;
+    bool                isServer;
+    NetworkSocket *     socket;
+    Handshake *         handshake;
+    ConnectionMonitor * connectionMonitor;
+    int                 lastAckedState;
+    int                 lastRecvedState;
 };
 
@@ -85 +81 @@
     void handleDownstream(); 
     void handleNewClient( int userId );
+    void cleanUpOldSyncList();
 
 
   private:
-    NetworkProtocol*           networkProtocol;
-    ConnectionMonitor*         connectionMonitor;
     SynchronizeableList        synchronizeables;
     PeerList                   peers;
     ServerSocket*              serverSocket;
     int                        type;
-    Header                     packetHeader;
     bool                       bActive;
     std::list<int>             freeSocketSlots;