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

Timestamp:

May 10, 2006, 1:13:49 PM (18 years ago)

Author:

rennerc

Message:

reimplemented NetworkStream

File:

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

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

@@ -9 +9 @@
 #include <vector>
 #include <list>
+#include <map>
 
 #include "data_stream.h"
@@ -22 +23 @@
 class NetworkGameManager;
 
+class PeerInfo
+{
+  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;
+};
+
 typedef std::list<Synchronizeable*>  SynchronizeableList;
-typedef std::vector<NetworkSocket*>  NetworkSocketVector;
-typedef std::vector<Handshake*>      HandshakeVector;
+typedef std::map<int,PeerInfo>       PeerList;
 
 
@@ -48 +61 @@
 
     inline int getMaxConnections(){ return maxConnections; }
-    void setMaxConnections( int n );
 
     virtual void processData();
@@ -56 +68 @@
     int getSyncCount();
 
-    inline bool isUserIdActive( int userID ) { if (userID>=networkSockets.size()) return false; else return networkSockets[userID]!=NULL; }
+    inline bool isUserIdActive( int userID ) { return (peers.find(userID) != peers.end()); }
 
     void debug();
+    
+    inline PeerInfo & getPeerInfo( int userId ) { return peers[userId]; }
 
 
   private:
     void updateConnectionList();
+    void handleHandshakes();
+    void handleUpstream();
+    void handleDownstream(); 
 
 
@@ -69 +86 @@
     ConnectionMonitor*         connectionMonitor;
     SynchronizeableList        synchronizeables;
-    NetworkSocketVector        networkSockets;
-    HandshakeVector            handshakes;
+    PeerList                   peers;
     ServerSocket*              serverSocket;
     int                        type;
@@ -79 +95 @@
     int                        myHostId;
     int                        maxConnections;
+    
+    int                        currentState;
 
     NetworkGameManager*        networkGameManager;