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

Timestamp:

Jul 27, 2006, 10:44:28 AM (19 years ago)

Author:

bensch

Message:

merged the proxy back

File:

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

trunk/src/lib/network/network_stream.h

@@ -42 +42 @@
 
     void connectToMasterServer(std::string host, int port);
-    void connectToProxyServer(std::string host, int port);
-    void createServer(int port);
+    void connectToProxyServer(int proxyId, std::string host, int port);
+    void createServer(int clientPort, int proxyPort);
 
     void createNetworkGameManager();
-    void startHandshake();
+    void startHandshake(int userId = NET_ID_MASTER_SERVER);
 
     /* synchronizeable interface */
@@ -55 +55 @@
 
     /* functions for the peerInfo information retreival */
+    /** @returns true if this userId is activated at this client false if not*/
     inline bool isUserIdActive( int userID ) { return (peers.find(userID) != peers.end()); }
+    /** @returns true if this userId is a local client */
+    inline bool isUserLocal( int userID) { return this->isUserIdActive(userID); }
+    /** @returns true if this user is a master server */
     inline bool isUserMasterServer( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isMasterServer(); }
-    inline bool isUserProxyServer( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isProxyServer(); }
+    /** @returns true if this user is a proxy server */
+    inline bool isUserProxyServerActive( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isProxyServerActive(); }
+    /** @returns true if this user is a client */
     inline bool isUserClient( int userID ){ if ( !isUserIdActive(userID) ) return false; return peers[userID].isClient(); }
 
@@ -80 +86 @@
 
     void updateConnectionList();
+
     /* handle processes */
     void handleHandshakes();
@@ -87 +94 @@
     /* handle events*/
     void handleNewClient( int userId );
+
+    void handleConnect( int userId);
     void handleReconnect( int userId );
+    void handleDisconnect( int userId );
 
     void writeToNewDict( byte * data, int length, bool upstream );
@@ -102 +112 @@
     NetworkMonitor*            networkMonitor;              //!< the network monitor
     NetworkGameManager*        networkGameManager;          //!< reference to the network game manager
-    ServerSocket*              serverSocket;                //!< the listening socket of the server
+    ServerSocket*              clientSocket;                //!< the listening socket of the server
+    ServerSocket*              proxySocket;                 //!< socket for proxy connections
 
     std::map<int,int>          oldSynchronizeables;         //!< used to save recently deleted sync ids to not recreate them
@@ -113 +124 @@
     int                        dictServer;                  //!< the zip dict for the server
     int                        dictClient;                  //!< the zip dict for the client
+
+    bool                       bRedirect;                   //!< true if the master server sent a redirect command
 };
 #endif /* _NETWORK_STREAM */