Changeset 9589 in orxonox.OLD for branches

Timestamp:

Jul 28, 2006, 11:32:05 PM (18 years ago)

Author:

patrick

Message:

now the nodes get added in hirarchical way

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -227 +227 @@
 
 /**
+ * @param userId of the searched node
+ * @returns the PeerInfo of the userId peer
+ */
+PeerInfo* NetworkMonitor::getPeerByUserId( int userId)
+{
+  PeerInfo* pInfo;
+  std::list<NetworkNode*>::iterator it = this->nodeList.begin();
+  for(; it != this->nodeList.end(); it++)
+  {
+    pInfo = (*it)->getPeerByUserId(userId);
+    if( pInfo != NULL)
+      return pInfo;
+  }
+  return NULL;
+}
+
+/**
+ * searches for a given NetworkNode
+ * @param userId of the searched node
+ * @returns the PeerInfo of the userId peer
+ */
+NetworkNode* NetworkMonitor::getNodeByUserId( int userId)
+{
+  std::list<NetworkNode*>::iterator it = this->nodeList.begin();
+  for(; it != this->nodeList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+      return (*it);
+  }
+  return NULL;
+}
+
+
+/**
  * this displays the network monitor gui
  */

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

@@ -79 +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); }
+    PeerInfo* getPeerByUserId( int userId);
+    NetworkNode* getNodeByUserId( int userId);
 
 

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

@@ -130 +130 @@
   // register the new node at the network monitor
   NetworkMonitor* netMon = SharedNetworkData::getInstance()->getNetworkMonitor();
+  NetworkNode* nNode = netMon->getNodeByUserId(senderId); // this gets the proxy server who sent the msg
   PeerInfo* pInfo = new PeerInfo();
   pInfo->bLocal = false;
@@ -135 +136 @@
   pInfo->nodeType = NET_CLIENT;
   pInfo->userId = newClientId;
-  netMon->addNode(pInfo);
+  netMon->addNode(nNode, pInfo);
 
   PRINTF(0)("Got Signal: from %i new player arrived with userId: %i and ip: %i\n", senderId, newClientId, pInfo->ip.ipString().c_str());
@@ -193 +194 @@
   // remove the node from the network monitor
   NetworkMonitor* netMon = SharedNetworkData::getInstance()->getNetworkMonitor();
-  netMon->removeNode( netMon->getPeerByUserId(leaveClientId));
+  NetworkNode* nNode = netMon->getNodeByUserId(senderId); // this gets the proxy server who sent the msg
+  netMon->removeNode(nNode, netMon->getPeerByUserId(leaveClientId));
 
   PRINTF(0)("Got Signal: from %i new player left with userId: %i\n", senderId, leaveClientId);