Changeset 9586 in orxonox.OLD

Timestamp:

Jul 28, 2006, 10:53:46 PM (18 years ago)

Author:

patrick

Message:

removing the client from the network monitor does also work now

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (1 diff)
• monitor/network_monitor.h (modified) (2 diffs)
• proxy/proxy_control.cc (modified) (3 diffs)

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -176 +176 @@
 
 
+
+/**
+ * removes a node from the network monitor
+ * @param pInfo the node to remove
+ */
+void NetworkMonitor::removeNode(PeerInfo* pInfo)
+{
+  this->removeNode(this->localNode, pInfo);
+}
+
+
+/**
+ * removes the network node
+ * @param node the network node where the PeerInfo node is connected to
+ * @param pInfo the PeerInfo to remove
+ */
+void NetworkMonitor::removeNode(NetworkNode* node, PeerInfo* pInfo)
+{
+  if( node == NULL || pInfo == NULL)
+    return;
+
+  if( pInfo->isClient())
+    node->removeClient(pInfo);
+  else if( pInfo->isProxyServerActive())
+    node->removeActiveProxyServer(pInfo);
+  else if( pInfo->isMasterServer())
+    node->removeMasterServer(pInfo);
+}
+
+
 /**
  * @returns the proxy server of the first choice

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -50 +50 @@
     inline void addMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->addMasterServer(pInfo); }
 
+    void removeNode(PeerInfo* pInfo);
+    void removeNode(NetworkNode* node, PeerInfo* pInfo);
+
     inline void removeClient(NetworkNode* node, PeerInfo* pInfo) { node->removeClient(pInfo); }
     inline void removeActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removeActiveProxyServer(pInfo); }
@@ -76 +79 @@
 
     inline const std::list<NetworkNode*>& getNodeList() const { return this->nodeList; };
+    /** @param userId of the searched node @returns the PeerInfo of the userId peer */
     inline PeerInfo* getPeerByUserId( int userId) { return this->localNode->getPeerByUserId(userId); }
+
 
     void toggleGUI();

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

@@ -134 +134 @@
   pInfo->ip = IP(ipHost, 9999);
   pInfo->nodeType = NET_CLIENT;
+  pInfo->userId = newClientId;
   netMon->addNode(pInfo);
 
@@ -142 +143 @@
     // we now create the new player ship and stuff...
     NetworkGameManager::getInstance()->signalNewPlayer(newClientId);
-  }
-  else if(SharedNetworkData::getInstance()->isProxyServerActive())
-  {
-
   }
 
@@ -194 +191 @@
   assert( Converter::byteArrayToInt( data, &leaveClientId) == INTSIZE );
 
+  // remove the node from the network monitor
+  NetworkMonitor* netMon = SharedNetworkData::getInstance()->getNetworkMonitor();
+  netMon->removeNode( netMon->getPeerByUserId(leaveClientId));
+
   PRINTF(0)("Got Signal: from %i new player left with userId: %i\n", senderId, leaveClientId);
   // part for the master server