Changeset 9604 in orxonox.OLD

Timestamp:

Jul 29, 2006, 11:22:58 AM (18 years ago)

Author:

patrick

Message:

started implementation for soft connections

Location:

branches/proxy/src/lib/network

Files:

• network_manager.cc (modified) (2 diffs)
• network_stream.cc (modified) (7 diffs)
• network_stream.h (modified) (3 diffs)

branches/proxy/src/lib/network/network_manager.cc

@@ -112 +112 @@
   // create the network stream
   this->networkStream = new NetworkStream(NET_MASTER_SERVER);
-  this->networkStream->createServer( port, port + 1);
+  this->networkStream->createServer( port, port + 1, port + 2);
 
   // start the network game manager
@@ -142 +142 @@
 
   // then start the server
-  this->networkStream->createServer( port, port +1);
+  this->networkStream->createServer( port, port + 1, port + 2);
 
   // and to the other proxy servers also, this would be very nice if its works

branches/proxy/src/lib/network/network_stream.cc

@@ -113 +113 @@
   this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
   this->clientSocket = NULL;
+  this->clientSoftSocket = NULL;
   this->proxySocket = NULL;
   this->networkGameManager = NULL;
@@ -144 +145 @@
   if ( this->clientSocket )
   {
-    clientSocket->close();
-    delete clientSocket;
-    clientSocket = NULL;
+    this->clientSocket->close();
+    delete this->clientSocket;
+    this->clientSocket = NULL;
+  }
+  if ( this->clientSoftSocket )
+  {
+    this->clientSoftSocket->close();
+    delete this->clientSoftSocket;
+    this->clientSoftSocket = NULL;
   }
   if ( this->proxySocket)
@@ -229 +236 @@
  * @param port: interface port for all clients
  */
-void NetworkStream::createServer(int clientPort, int proxyPort)
+void NetworkStream::createServer(int clientPort, int proxyPort, int clientSoftPort)
 {
   PRINTF(0)(" Creating new Server: listening for clients on port %i and for proxies on port %i", clientPort, proxyPort);
   this->clientSocket= new UdpServerSocket(clientPort);
+  this->clientSoftSocket= new UdpServerSocket(clientSoftPort);
   this->proxySocket = new UdpServerSocket(proxyPort);
 }
@@ -326 +334 @@
     if ( this->clientSocket )
       this->clientSocket->update();
+    if ( this->clientSoftSocket)
+      this->clientSoftSocket->update();
     if( this->proxySocket)
       this->proxySocket->update();
@@ -336 +346 @@
     if ( this->clientSocket )
       this->clientSocket->update();
+    if ( this->clientSoftSocket)
+      this->clientSoftSocket->update();
     if( this->proxySocket)
       this->proxySocket->update();
@@ -424 +436 @@
   }
 
+  if( this->clientSoftSocket != NULL)
+  {
+    tempNetworkSocket = this->clientSoftSocket->getNewSocket();
+
+    // we got new NET_CLIENT connecting
+    if ( tempNetworkSocket )
+    {
+
+      // this creates a new entry in the peers list
+      peers[userId].socket = tempNetworkSocket;
+      peers[userId].nodeType = NET_CLIENT;
+
+      // handle the newly connected client
+      this->handleSoftConnect(userId);
+
+      PRINTF(0)("New Client softly connected: %d :D\n", userId);
+    }
+  }
+
 
   if( this->proxySocket != NULL)
@@ -540 +571 @@
   this->peers[userId].ip = this->peers[userId].socket->getRemoteAddress();
 }
+
+
+/**
+ * this handles new soft connections
+ * @param userId: the id of the new user node
+ *
+ * soft connections are connections from clients that are already in the network and don't need a new handshake etc.
+ * the state of all entitites owned by userId are not deleted and stay
+ * soft connections can not be redirected therefore they are negotiated between the to parties
+ */
+void NetworkStream::handleSoftConnect( int userId)
+{
+  // create new handshake and init its variables
+  this->peers[userId].handshake = NULL;
+  this->peers[userId].handshake->setUniqueID(userId);
+
+  this->peers[userId].connectionMonitor = new ConnectionMonitor( userId );
+  this->peers[userId].userId = userId;
+  this->peers[userId].bLocal = true;
+
+  PRINTF(0)("num sync: %d\n", synchronizeables.size());
+
+  // the connecting node of course is a client
+  this->peers[userId].ip = this->peers[userId].socket->getRemoteAddress();
+}
+
 
 

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

@@ -44 +44 @@
     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();
@@ -101 +101 @@
 
     void handleConnect( int userId);
+    void handleSoftConnect( int userId);
     void handleReconnect( int userId );
     void handleDisconnect( int userId );
@@ -117 +118 @@
     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