Changeset 6139 in orxonox.OLD for trunk/src/lib/network/network_stream.h

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

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

trunk/src/lib/network/network_stream.h

@@ -7 +7 @@
 #define _NETWORK_STREAM
 
+#include <vector>
+#include <list>
+
 #include "data_stream.h"
 #include "network_protocol.h"
+#include "server_socket.h"
+#include "handshake.h"
 
 class Synchronizeable;
 class NetworkSocket;
+class ServerSocket;
 class ConnectionMonitor;
 class NetworkProtocol;
 
-
-//<! The state of the NetworkStream
-typedef enum NetStat {
-  NET_REC_HEADER = 0,                          //!< Waiting for header
-  NET_REC_DATA,                                //!< Waiting for data
-
-  NUM_STATES                                   //!< Number of states
-};
+typedef std::list<Synchronizeable*>  SynchronizeableList;
+typedef std::vector<NetworkSocket*>  NetworkSocketVector;
+typedef std::vector<Handshake*>      HandshakeVector;
 
 
@@ -30 +31 @@
   public:
     NetworkStream();
-    NetworkStream(IPaddress& address, NodeType type);
-    NetworkStream(unsigned int port, NodeType type);
+    NetworkStream(IPaddress& address);
+    NetworkStream(unsigned int port);
 
-    NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type);
-    NetworkStream(unsigned int port, Synchronizeable& sync, NodeType type);
     ~NetworkStream();
     void init();
 
     void connectSynchronizeable(Synchronizeable& sync);
+    void disconnectSynchronizeable(Synchronizeable& sync);
 
     inline bool isServer() const { return (this->type == NET_SERVER)? true:false; }
     inline bool isActive() const { return this->bActive; }
+
+    inline int getMaxConnections(){ return maxConnections; }
+    void setMaxConnections( int n );
 
     virtual void processData();
@@ -48 +51 @@
     NetworkProtocol*       networkProtocol;
     ConnectionMonitor*     connectionMonitor;
-    Synchronizeable*       synchronizeables;
-    NetworkSocket*         networkSocket;
+    SynchronizeableList    synchronizeables;
+    NetworkSocketVector    networkSockets;
+    HandshakeVector        handshakes;
+    ServerSocket*          serverSocket;
     int                    type;
-    int                    state;
     Header                 packetHeader;
     bool                   bActive;
+    std::list<int>         freeSocketSlots;
+
+    int                    myHostId;
+    int                    maxConnections;
+
+    void updateConnectionList();
 };
 #endif /* _NETWORK_STREAM */