Changeset 9286 in orxonox.OLD

Timestamp:

Jul 14, 2006, 10:59:33 AM (18 years ago)

Author:

patrick

Message:

first network monitor debug session

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -155 +155 @@
     this->playerNumber += (*it)->getPlayerNumber();
   }
+
+  this->debug();
 }
 
-
+/**
+ * prints out the debug informations
+ */
 void NetworkMonitor::debug()
 {
   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)("==========================================================\n");
+//   PRINTF(0)(" Currently got %i");
 }
 

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

@@ -34 +34 @@
     /** @returns the node type of this node */
     inline int getNodeType() { return this->peerInfo->nodeType; }
+    /** @returns the peer info of this node */
+    inline PeerInfo* getPeerInfo() { return this->peerInfo; }
 
 

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();
 
 

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

@@ -50 +50 @@
   this->connectionMonitor = NULL;
 }
+
+
+std::string PeerInfo::getNodeTypeString()
+{
+  switch( this->nodeType)
+  {
+    case NET_CLIENT:
+      return std::string("client");
+    case NET_PROXY_SERVER:
+      return std::string("proxy server");
+    case NET_MASTER_SERVER:
+      return std::string("master server");
+  }
+
+  return std::string("node is uninit");
+}

branches/proxy/src/lib/network/peer_info.h

@@ -11 +11 @@
 #include "monitor/connection_monitor.h"
 
+#include <string>
 
 //!< this structure contains informations about the network node
@@ -25 +26 @@
     inline bool isClient() { return this->nodeType == NET_CLIENT; }
 
+    std::string getNodeTypeString();
+
 
   public:
     int                 userId;
     int                 nodeType;
-//     bool                isMasterServer;
-//     bool                isProxyServer;
-//     bool                isClient;
     NetworkSocket *     socket;
     Handshake *         handshake;