Changeset 9637 in orxonox.OLD

Timestamp:

Jul 31, 2006, 3:16:35 AM (18 years ago)

Author:

patrick

Message:

the node registration now works perfectly and hirarchicaly

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -238 +238 @@
 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;
-  }
+  NetworkNode* node = this->getNodeByUserId(userId);
+  if( node != NULL)
+    return node->getPeerInfo();
+
   return NULL;
 }
@@ -257 +253 @@
 {
   std::list<NetworkNode*>::iterator it = this->nodeList.begin();
+  NetworkNode* node = NULL;
   for(; it != this->nodeList.end(); it++)
   {
-    PRINTF(0)("comparing %i to %i\n", (*it)->getPeerInfo()->userId, userId);
-    if( (*it)->getPeerInfo()->userId == userId)
-      return (*it);
-  }
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
   return NULL;
 }

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

@@ -352 +352 @@
 
 
+
+/**
+ * searches for a given NetworkNode
+ * @param userId of the searched node
+ * @returns the PeerInfo of the userId peer
+ */
+NetworkNode* NetworkNode::getNodeByUserId( int userId)
+{
+  if( this->peerInfo->userId == userId)
+    return this;
+
+
+  NetworkNode* node = NULL;
+  std::list<NetworkNode*>::iterator it = this->masterServerList.begin();
+
+  for(; it != this->masterServerList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  it = this->activeProxyServerList.begin();
+  for(; it != this->activeProxyServerList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  it = this->passiveProxyServerList.begin();
+  for(; it != this->passiveProxyServerList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  it = this->clientList.begin();
+  for(; it != this->clientList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  return NULL;
+}
+
+
 /**
  * debug function
@@ -362 +412 @@
   indent[depth] = '\0';
 
-  PRINT(0)("%s + %s, with ip: %s\n", indent,  this->peerInfo->getNodeTypeString().c_str(), this->peerInfo->ip.ipString().c_str());
+  PRINT(0)("%s + %s, with id %i and ip: %s\n", indent, this->peerInfo->getNodeTypeString().c_str(), this->peerInfo->userId, this->peerInfo->ip.ipString().c_str());
   std::list<NetworkNode*>::const_iterator it;
   if( !this->masterServerList.empty())

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

@@ -61 +61 @@
     inline PeerInfo* getPeerInfo() const { return this->peerInfo; }
 
+    NetworkNode* getNodeByUserId( int userId);
+
     void debug(int depth) const;
 

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

@@ -137 +137 @@
   NetworkMonitor* netMon = SharedNetworkData::getInstance()->getNetworkMonitor();
   NetworkNode* nNode = netMon->getNodeByUserId(senderId); // this gets the proxy server who sent the msg
+  if( nNode == NULL)
+    PRINTF(0)("Couldn't find node %i! Error\n", senderId);
   PeerInfo* pInfo = new PeerInfo();
   pInfo->bLocal = false;
@@ -144 +146 @@
   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());
+  PRINTF(0)("Got Signal: from %i new player arrived with userId: %i and ip: %s on %i\n", senderId, newClientId, pInfo->ip.ipString().c_str(), senderId);
   // part for the master server
   if( SharedNetworkData::getInstance()->isMasterServer())