Changeset 9292 in orxonox.OLD

Timestamp:

Jul 14, 2006, 1:17:08 PM (18 years ago)

Author:

patrick

Message:

seperating the proxy servers in passive and active

Location:

branches/proxy/src/lib/network/monitor

Files:

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

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

@@ -100 +100 @@
   else if( pInfo->isProxyServer())
   {
-    this->localNode->addProxyServer(pInfo);
+    this->localNode->addActiveProxyServer(pInfo);
     // create a new node, since a proxy can connect clients again
     NetworkNode* node = new NetworkNode(pInfo);
@@ -125 +125 @@
     node->addClient(pInfo);
   else if( pInfo->isProxyServer())
-    node->addProxyServer(pInfo);
+    node->addActiveProxyServer(pInfo);
   else if( pInfo->isMasterServer())
     node->addMasterServer(pInfo);

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

@@ -41 +41 @@
     inline void addClient(NetworkNode* node, PeerInfo* pInfo) { node->addClient(pInfo); }
     /** adds to @param node a network node @param pInfo a new proxy server */
-    inline void addProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addProxyServer(pInfo); }
+    inline void addActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addActiveProxyServer(pInfo); }
     /** adds to @param node a network node @param pInfo a new master server*/
     inline void addMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->addMasterServer(pInfo); }
 
     inline void removeClient(NetworkNode* node, PeerInfo* pInfo) { node->removeClient(pInfo); }
-    inline void removeProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removeProxyServer(pInfo); }
+    inline void removeActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removeActiveProxyServer(pInfo); }
     inline void removeMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->removeMasterServer(pInfo); }
 
@@ -53 +53 @@
 
     /** @returns true if there are still free network slots available */
-    inline bool gotFreeSlots() { return (this->playerNumber < NET_MAX_CONNECTIONS)?true:false; }
+    inline bool gotFreeSlots() { return (this->localNode->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
+    /** @param node node to be checked for slots @returns true if there are still free network slots available at this node */
+    inline bool gorFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
     void getServerWithFreeSlots() { }
 

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

@@ -48 +48 @@
  * adds a proxy server
  */
-void NetworkNode::addProxyServer(PeerInfo* node)
+void NetworkNode::addActiveProxyServer(PeerInfo* node)
 {
-  this->proxyServerList.push_back(node);
+  this->activeProxyServerList.push_back(node);
   this->playerNumber++;
+}
+
+/**
+ * adds a proxy server
+ */
+void NetworkNode::addPassiveProxyServer(PeerInfo* node)
+{
+  this->passiveProxyServerList.push_back(node);
 }
 
@@ -85 +93 @@
  * removes a proxy server
  */
-void NetworkNode::removeProxyServer(PeerInfo* node)
+void NetworkNode::removeActiveProxyServer(PeerInfo* node)
 {
-  std::list<PeerInfo*>::iterator it = this->proxyServerList.begin();
-  for(; it != this->proxyServerList.end(); it++)
+  std::list<PeerInfo*>::iterator it = this->activeProxyServerList.begin();
+  for(; it != this->activeProxyServerList.end(); it++)
   {
     if( *it == node)
     {
-      this->proxyServerList.erase(it);
+      this->activeProxyServerList.erase(it);
       this->playerNumber--;
+      return;
+    }
+  }
+
+  PRINTF(2)("Could not remove proxy server from the list, very strange...");
+}
+
+/**
+ * removes a proxy server
+ */
+void NetworkNode::removePassiveProxyServer(PeerInfo* node)
+{
+  std::list<PeerInfo*>::iterator it = this->passiveProxyServerList.begin();
+  for(; it != this->passiveProxyServerList.end(); it++)
+  {
+    if( *it == node)
+    {
+      this->passiveProxyServerList.erase(it);
       return;
     }
@@ -137 +163 @@
   }
 
-  PRINT(0)("    proxy servers: %i\n", this->proxyServerList.size());
-  it = this->proxyServerList.begin();
-  for(; it != this->proxyServerList.end(); it++)
+  PRINT(0)("    proxy servers: %i\n", this->activeProxyServerList.size());
+  it = this->activeProxyServerList.begin();
+  for(; it != this->activeProxyServerList.end(); it++)
   {
     PRINT(0)("     - ps, id: %i\n", (*it)->userId);

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

@@ -23 +23 @@
 
     void addClient(PeerInfo* node);
-    void addProxyServer(PeerInfo* node);
+    void addActiveProxyServer(PeerInfo* node);
+    void addPassiveProxyServer(PeerInfo* node);
     void addMasterServer(PeerInfo* node);
 
     void removeClient(PeerInfo* node);
-    void removeProxyServer(PeerInfo* node);
+    void removeActiveProxyServer(PeerInfo* node);
+    void removePassiveProxyServer(PeerInfo* node);
     void removeMasterServer(PeerInfo* node);
 
@@ -46 +48 @@
     /* network nodes directly connected to this node */
     std::list<PeerInfo*>         clientList;                   //!< list of all clients in the network
-    std::list<PeerInfo*>         proxyServerList;              //!< list of all proxy servers in the network
+    std::list<PeerInfo*>         activeProxyServerList;        //!< list of all proxy servers in the network
+    std::list<PeerInfo*>         passiveProxyServerList;       //!< list of all proxy servers in the network
     std::list<PeerInfo*>         masterServerList;             //!< list of all master servers in the network (should be 1!! :D)