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

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

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

trunk/src/lib/network/network_stream.h

@@ -41 +41 @@
     void init();
 
+    /* network interface controls */
     void connectToMasterServer(std::string host, int port);
     void connectToProxyServer(int proxyId, std::string host, int port);
-    void createServer(int clientPort, int proxyPort);
+    void createServer(int clientPort, int proxyPort, int clientSoftPort);
 
     void createNetworkGameManager();
     void startHandshake(int userId = NET_ID_MASTER_SERVER);
+
+    void reconnectToServer(IP address);
+    void softReconnectToServer(int serverUserId, IP address);
+    void prepareSoftConnection(int userId);
+
 
     /* synchronizeable interface */
@@ -70 +76 @@
     inline PeerInfo* getPeerInfo() { return this->pInfo; }
     inline PeerList getPeerInfoList() { return this->peers; }
+
+    inline void setRedirectionTest() { this->bSoftRedirect = true; }
 
     /* data processing*/
@@ -96 +104 @@
 
     void handleConnect( int userId);
+    void handleSoftConnect( int userId);
     void handleReconnect( int userId );
     void handleDisconnect( int userId );
+    void handleSoftDisconnect( int userId);
 
     void writeToNewDict( byte * data, int length, bool upstream );
@@ -112 +122 @@
     NetworkMonitor*            networkMonitor;              //!< the network monitor
     NetworkGameManager*        networkGameManager;          //!< reference to the network game manager
-    ServerSocket*              clientSocket;                //!< the listening socket of the server
+    ServerSocket*              clientSocket;                //!< the listening socket for clients of the server
+    ServerSocket*              clientSoftSocket;            //!< the listening socket for soft connections to the server
     ServerSocket*              proxySocket;                 //!< socket for proxy connections
 
@@ -126 +137 @@
 
     bool                       bRedirect;                   //!< true if the master server sent a redirect command
+    int                        redirectionUID;              //!< uid of the redir host
+    bool                       bSoftRedirect;               //!< tsting
 };
 #endif /* _NETWORK_STREAM */