Changeset 9308 in orxonox.OLD for branches/proxy/src/lib/network/monitor

Timestamp:

Jul 17, 2006, 5:47:32 PM (18 years ago)

Author:

patrick

Message:

proxy server ip synchronizeing bug, nodes get registered

Location:

branches/proxy/src/lib/network/monitor

Files:

• network_monitor.cc (modified) (3 diffs)
• network_monitor.h (modified) (1 diff)
• network_node.cc (modified) (2 diffs)

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

@@ -20 +20 @@
 
 #include "proxy/proxy_settings.h"
+#include "shared_network_data.h"
 
 #include "network_monitor.h"
@@ -52 +53 @@
   this->setSynchronized(false);
 
-  // assuming that the config files are already read we get the proxy servers
-  std::vector<IPaddress*>* proxyList = ProxySettings::getInstance()->getProxyList();
-  std::vector<IPaddress*>::iterator it = proxyList->begin();
-  // create a peer info class and a network node class for each new proxy and add them to the passive list
-  for(; it < proxyList->end(); it++)
-  {
-    PeerInfo* peer = new PeerInfo();
-    peer->ip = *(*it);
-    peer->nodeType = NET_PROXY_SERVER_ACTIVE;
-    peer->userId = -1;
-
-    NetworkNode* node = new NetworkNode(peer);
-    this->addPassiveProxyServer( this->localNode, peer);
+  // read in the proxy server list, this is only the case for the master server
+  if( SharedNetworkData::getInstance()->isMasterServer())
+  {
+    // assuming that the config files are already read we get the proxy servers
+    std::vector<IPaddress*>* proxyList = ProxySettings::getInstance()->getProxyList();
+    std::vector<IPaddress*>::iterator it = proxyList->begin();
+    // create a peer info class and a network node class for each new proxy and add them to the passive list
+    for(; it < proxyList->end(); it++)
+    {
+      PeerInfo* peer = new PeerInfo();
+      peer->ip = *(*it);
+      peer->nodeType = NET_PROXY_SERVER_ACTIVE;
+      peer->userId = -1;
+
+      NetworkNode* node = new NetworkNode(peer);
+      this->addNode( node);
+      this->addPassiveProxyServer( this->localNode, peer);
+    }
   }
 }
@@ -111 +117 @@
  * @param ip ip of the new node
  */
-void NetworkMonitor::addNode(IPaddress ip)
-{}
+void NetworkMonitor::addNode(IPaddress ip, int nodeType)
+{
+  PeerInfo* pInfo = new PeerInfo();
+  pInfo->nodeType = nodeType;
+  pInfo->ip = ip;
+
+  this->addNode( pInfo);
+}
 
 

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

@@ -34 +34 @@
     void removeNetworkNode(NetworkNode* node);
 
-    void addNode(IPaddress ip);
     void addNode(PeerInfo* pInfo);
+    void addNode(IPaddress ip, int nodeType);
     void addNode(NetworkNode* node) { this->nodeList.push_back(node); }
     void addNode(NetworkNode* node, PeerInfo* pInfo);

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

@@ -239 +239 @@
   for(; it != this->masterServerList.end(); it++)
   {
-    PRINT(0)("     - ms, id: %i\n", (*it)->userId);
-  }
-
-  PRINT(0)("    proxy servers: %i\n", this->activeProxyServerList.size());
+    int ip = (*it)->ip.host;
+    PRINT(0)("     - ms, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
+  }
+
+  PRINT(0)("    proxy servers active: %i\n", this->activeProxyServerList.size());
   it = this->activeProxyServerList.begin();
   for(; it != this->activeProxyServerList.end(); it++)
   {
-    PRINT(0)("     - ps, id: %i\n", (*it)->userId);
+    int ip = (*it)->ip.host;
+    PRINT(0)("     - ps-a, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
+  }
+
+  PRINT(0)("    proxy servers passive: %i\n", this->passiveProxyServerList.size());
+  it = this->passiveProxyServerList.begin();
+  for(; it != this->passiveProxyServerList.end(); it++)
+  {
+    int ip = (*it)->ip.host;
+    PRINT(0)("     - ps-p, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
   }
 
@@ -253 +263 @@
   for(; it != this->clientList.end(); it++)
   {
-    PRINT(0)("     - client, id: %i\n", (*it)->userId);
-  }
-}
-
+    int ip = (*it)->ip.host;
+    PRINT(0)("     - client, id: %i (%d.%d.%d.%d:9999)\n", (*it)->userId, (ip & 0x000000FF), (ip & 0x0000FF00) >> 8, (ip & 0x00FF0000) >> 16, (ip & 0xFF000000)>>24);
+  }
+}
+