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

Timestamp:

Jul 19, 2006, 10:29:14 PM (18 years ago)

Author:

patrick

Message:

work of the day in one commit:D

• switched whole network framework to ip sturcture
• extended ip structrue a little bit
• reimplemented the disconnection/reconnection algorithm
• synchronizeable ip bug discovered and solved

Location:

branches/proxy/src/lib/network/monitor

Files:

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

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

@@ -117 +117 @@
  * @param ip ip of the new node
  */
-void NetworkMonitor::addNode(IPaddress ip, int nodeType)
+void NetworkMonitor::addNode(IP ip, int nodeType)
 {
   PeerInfo* pInfo = new PeerInfo();

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

@@ -10 +10 @@
 #include "synchronizeable.h"
 #include "shared_network_data.h"
+#include "ip.h"
 
 #include "network_node.h"
@@ -36 +37 @@
 
     void addNode(PeerInfo* pInfo);
-    void addNode(IPaddress ip, int nodeType);
+    void addNode(IP ip, int nodeType);
     void addNode(NetworkNode* node) { this->nodeList.push_back(node); }
     void addNode(NetworkNode* node, PeerInfo* pInfo);
@@ -65 +66 @@
     PeerInfo* getSecondChoiceProxy();
     /** @returns true if the next client should be reconnected to some other proxy server with more connections */
-    inline bool reconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
+    inline bool isReconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
 
 

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

@@ -239 +239 @@
   for(; it != this->masterServerList.end(); it++)
   {
-    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);
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - ms, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -247 +247 @@
   for(; it != this->activeProxyServerList.end(); it++)
   {
-    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);
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - ps-a, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -255 +255 @@
   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);
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - ps-p, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -263 +263 @@
   for(; it != this->clientList.end(); it++)
   {
-    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);
-  }
-}
-
+    IP* ip = &(*it)->ip;
+    PRINT(0)("     - client, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
+  }
+}
+