Changeset 9287 in orxonox.OLD for branches

Timestamp:

Jul 14, 2006, 11:18:17 AM (18 years ago)

Author:

patrick

Message:

now testing the network monitor

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (3 diffs)
• monitor/network_monitor.h (modified) (1 diff)
• network_stream.cc (modified) (2 diffs)

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

@@ -40 +40 @@
   this->networkStream = networkStream;
   this->playerNumber = 0;
+  // create the localnode, init it and add it to the nodes list
   this->localNode = new NetworkNode( this->networkStream->getPeerInfo());
+  this->addNode(this->localNode);
 
   this->setSynchronized(false);
@@ -101 +103 @@
     this->localNode->addMasterServer(pInfo);
 }
+
+
+/**
+ * adds a network node to the local node
+ *  @param node node to add to
+ *  @param pInfo node information
+ */
+void NetworkMonitor::addNode(NetworkNode* node, PeerInfo* pInfo)
+{
+  if( node == NULL)
+    return;
+
+  if( pInfo->isClient())
+    node->addClient(pInfo);
+  else if( pInfo->isProxyServer())
+    node->addProxyServer(pInfo);
+  else if( pInfo->isMasterServer())
+    node->addMasterServer(pInfo);
+}
+
 
 /**
@@ -166 +188 @@
   PRINTF(0)("================================= Network Monitor ========\n");
   PRINTF(0)(" I am: %s\n", this->localNode->getPeerInfo()->getNodeTypeString().c_str());
-  PRINTF(0)(" Total count of network nodes: %i\n", this->playerNumber);
+  PRINTF(0)(" Total count of network connections: %i\n", this->playerNumber);
+
+  std::list<NetworkNode*>::iterator it = this->nodeList.begin();
+  for(; it != this->nodeList.end(); it++)
+  {
+    (*it)->debug();
+  }
+
   PRINTF(0)("==========================================================\n");
 //   PRINTF(0)(" Currently got %i");

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

@@ -35 +35 @@
 
     void addNode(PeerInfo* pInfo);
-    void addNode(NetworkNode* node, PeerInfo* pInfo) {}
+    void addNode(NetworkNode* node) { this->nodeList.push_back(node); }
+    void addNode(NetworkNode* node, PeerInfo* pInfo);
 
     /** adds to @param node a network node @param pInfo a new client */

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

@@ -235 +235 @@
   if( this->networkMonitor == NULL)
     this->networkMonitor = new NetworkMonitor(this);
-  // and let it process some data
-  this->networkMonitor->process();
 
 
@@ -485 +483 @@
               {
                 it->second.nodeType = it->second.handshake->getRemoteNodeType();
+                this->networkMonitor->addNode(&it->second);
 
                 handleNewClient( it->second.userId );