Changeset 9625 in orxonox.OLD for branches/proxy/src/lib/network/monitor/network_monitor.cc

Timestamp:

Jul 30, 2006, 11:19:24 PM (18 years ago)

Author:

patrick

Message:

yet another weekend commit, quite much work done:

• introduced a new PERMISSION layer: PERMISSION_SERVER: the nearest server hast authority
• tightening up permissions: brand new implementation to prevent sending unused variables in the network (less smog in the net:D_
• removed some compiler warnings from some central modules
• networkmonitor interface changed to work with networknodes mainly
• better debug output for the network monitor
• networnode inteface standardisation
• force reconnection commands integration

File:

• branches/proxy/src/lib/network/monitor/network_monitor.cc (modified) (8 diffs)

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

@@ -10 +10 @@
 
 ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: Patrick Boenzli (patrick@orxonox.ethz.ch)
 */
 
@@ -49 +49 @@
   this->networkStream = networkStream;
   this->playerNumber = 0;
+  this->connectionNumber = 0;
   // create the localnode, init it and add it to the nodes list
   this->localNode = new NetworkNode( this->networkStream->getPeerInfo());
@@ -69 +70 @@
       peer->userId = -1;
 
-      NetworkNode* node = new NetworkNode(peer);
-      this->addNode( node);
       this->addActiveProxyServer( this->localNode, peer);
     }
@@ -141 +140 @@
     return;
 
+  PRINTF(0)("^^^^^^^^^^^^^^^^^^^^^^^^^^ adding node: %i with type: %s\n\n", pInfo->userId, pInfo->getNodeTypeString().c_str());
+
   if( pInfo->isClient())
-    this->localNode->addClient(pInfo);
+  {
+    this->localNode->addClient(new NetworkNode(pInfo));
+  }
   else if( pInfo->isProxyServerActive())
   {
-    this->localNode->addActiveProxyServer(pInfo);
-    // create a new node, since a proxy can connect clients again
-    NetworkNode* node = new NetworkNode(pInfo);
-    this->nodeList.push_back(node);
+    this->localNode->addActiveProxyServer(new NetworkNode(pInfo));
+  }
+  else if( pInfo->isProxyServerActivePassive())
+  {
+    this->localNode->addPassiveProxyServer(new NetworkNode(pInfo));
   }
   else if( pInfo->isMasterServer())
   {
-    this->localNode->addMasterServer(pInfo);
-  }
+    this->localNode->addMasterServer(new NetworkNode(pInfo));
+  }
+  else
+    assert(false);
 }
 
@@ -168 +174 @@
 
   if( pInfo->isClient())
-    node->addClient(pInfo);
+    node->addClient(new NetworkNode(pInfo));
   else if( pInfo->isProxyServerActive())
-    node->addActiveProxyServer(pInfo);
+    node->addActiveProxyServer(new NetworkNode(pInfo));
   else if( pInfo->isMasterServer())
-    node->addMasterServer(pInfo);
+    node->addMasterServer(new NetworkNode(pInfo));
 }
 
@@ -198 +204 @@
 
   if( pInfo->isClient())
-    node->removeClient(pInfo);
+    node->removeClient(pInfo->userId);
   else if( pInfo->isProxyServerActive())
-    node->removeActiveProxyServer(pInfo);
+    node->removeActiveProxyServer(pInfo->userId);
   else if( pInfo->isMasterServer())
-    node->removeMasterServer(pInfo);
+    node->removeMasterServer(pInfo->userId);
 }
 
@@ -253 +259 @@
   for(; it != this->nodeList.end(); it++)
   {
+    PRINTF(0)("comparing %i to %i\n", (*it)->getPeerInfo()->userId, userId);
     if( (*it)->getPeerInfo()->userId == userId)
       return (*it);
@@ -308 +315 @@
   for(; it != this->nodeList.end(); it++)
   {
-    (*it)->debug(0);
+    (*it)->debug(1);
   }