Changeset 9656 in orxonox.OLD for trunk/src/lib/network/monitor

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/lib/network/monitor

Files:

• network_monitor.cc (modified) (8 diffs)
• network_monitor.h (modified) (4 diffs)
• network_node.cc (modified) (15 diffs)
• network_node.h (modified) (5 diffs)
• network_stats_widget.cc (modified) (11 diffs)
• network_stats_widget.h (modified) (8 diffs)

trunk/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());
@@ -66 +67 @@
       PeerInfo* peer = new PeerInfo();
       peer->ip = (*it);
-      peer->nodeType = NET_PROXY_SERVER_ACTIVE;
+      peer->nodeType = NET_PROXY_SERVER_PASSIVE;
       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));
+}
+
+
+
+/**
+ * removes a node from the network monitor
+ * @param pInfo the node to remove
+ */
+void NetworkMonitor::removeNode(PeerInfo* pInfo)
+{
+  this->removeNode(this->localNode, pInfo);
+}
+
+
+/**
+ * removes the network node
+ * @param node the network node where the PeerInfo node is connected to
+ * @param pInfo the PeerInfo to remove
+ */
+void NetworkMonitor::removeNode(NetworkNode* node, PeerInfo* pInfo)
+{
+  if( node == NULL || pInfo == NULL)
+    return;
+
+  if( pInfo->isClient())
+    node->removeClient(pInfo->userId);
+  else if( pInfo->isProxyServerActive())
+    node->removeActiveProxyServer(pInfo->userId);
+  else if( pInfo->isMasterServer())
+    node->removeMasterServer(pInfo->userId);
 }
 
@@ -197 +233 @@
 
 /**
+ * @param userId of the searched node
+ * @returns the PeerInfo of the userId peer
+ */
+PeerInfo* NetworkMonitor::getPeerByUserId( int userId)
+{
+  NetworkNode* node = this->getNodeByUserId(userId);
+  if( node != NULL)
+    return node->getPeerInfo();
+
+  return NULL;
+}
+
+/**
+ * searches for a given NetworkNode
+ * @param userId of the searched node
+ * @returns the PeerInfo of the userId peer
+ */
+NetworkNode* NetworkMonitor::getNodeByUserId( int userId)
+{
+  std::list<NetworkNode*>::iterator it = this->nodeList.begin();
+  NetworkNode* node = NULL;
+  for(; it != this->nodeList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  return NULL;
+}
+
+
+/**
  * this displays the network monitor gui
  */
@@ -203 +272 @@
   if (this->box == NULL)
   {
-    this->box = new OrxGui::GLGuiBox(OrxGui::Vertical);
-    {
-      NetworkStatsWidget* netStats = new NetworkStatsWidget(this);
-      this->box->pack(netStats);
-
-    }
-
+    this->box = new NetworkStatsWidget(this);
     this->box->showAll();
-    this->box->setAbsCoor2D(300, 40);
   }
   else
@@ -251 +313 @@
   for(; it != this->nodeList.end(); it++)
   {
-    (*it)->debug(0);
+    (*it)->debug(1);
   }
 

trunk/src/lib/network/monitor/network_monitor.h

@@ -42 +42 @@
 
     /** adds to @param node a network node @param pInfo a new client */
-    inline void addClient(NetworkNode* node, PeerInfo* pInfo) { node->addClient(pInfo); }
+    inline void addClient(NetworkNode* node, PeerInfo* pInfo) { node->addClient(new NetworkNode(pInfo)); }
     /** adds to @param node a network node @param pInfo a new proxy server */
-    inline void addActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addActiveProxyServer(pInfo); }
+    inline void addActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addActiveProxyServer(new NetworkNode(pInfo)); }
     /** adds to @param node a network node @param pInfo a new proxy server */
-    inline void addPassiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addPassiveProxyServer(pInfo); }
+    inline void addPassiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addPassiveProxyServer(new NetworkNode(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 addMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->addMasterServer(new NetworkNode(pInfo)); }
 
-    inline void removeClient(NetworkNode* node, PeerInfo* pInfo) { node->removeClient(pInfo); }
-    inline void removeActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removeActiveProxyServer(pInfo); }
-    inline void removePassiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removePassiveProxyServer(pInfo); }
-    inline void removeMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->removeMasterServer(pInfo); }
+    void removeNode(PeerInfo* pInfo);
+    void removeNode(NetworkNode* node, PeerInfo* pInfo);
+
+    inline void removeClient(NetworkNode* node, int userId) { node->removeClient(userId); }
+    inline void removeActiveProxyServer(NetworkNode* node, int userId) { node->removeActiveProxyServer(userId); }
+    inline void removePassiveProxyServer(NetworkNode* node, int userId) { node->removePassiveProxyServer(userId); }
+    inline void removeMasterServer(NetworkNode* node, int userId) { node->removeMasterServer(userId); }
 
     PeerInfo* getFirstChoiceProxy() const;
@@ -61 +64 @@
 
     /** @returns the active proxy server list of the localnode */
-    inline std::list<PeerInfo*> getActiveProxyServer() const { return this->localNode->getActiveProxyServer(); }
+    inline std::list<NetworkNode*> getActiveProxyServers() const { return this->localNode->getActiveProxyServers(); }
 
     /* slots admin and info interface */
@@ -76 +79 @@
 
     inline const std::list<NetworkNode*>& getNodeList() const { return this->nodeList; };
+    PeerInfo* getPeerByUserId( int userId);
+    NetworkNode* getNodeByUserId( int userId);
+
+    /* forced reconnection interface */
+    inline void setForcedReconnection(IP address) { this->bForcedRecon = true; this->forcedReconnection = address;}
+    inline bool isForcedReconnection() const { return this->bForcedRecon; }
+    inline IP getForcedReconnectionIP() { this->bForcedRecon = false; return this->forcedReconnection; }
+
 
     void toggleGUI();
@@ -92 +103 @@
     int                          playerNumber;                 //!< total number of players in the game
     int                          connectionNumber;             //!< total number of connections at this localhost
+
+    IP                           forcedReconnection;           //!< ip of a forced reconnection
+    bool                         bForcedRecon;                 //!< true if there is a forced recon
 };
 

trunk/src/lib/network/monitor/network_node.cc

@@ -18 +18 @@
 #include "debug.h"
 
-
 /**
  * constructor
@@ -39 +38 @@
  * adds a client
  */
-void NetworkNode::addClient(PeerInfo* node)
+void NetworkNode::addClient(NetworkNode* node)
 {
   this->clientList.push_back(node);
@@ -49 +48 @@
  * adds a proxy server
  */
-void NetworkNode::addActiveProxyServer(PeerInfo* node)
+void NetworkNode::addActiveProxyServer(NetworkNode* node)
 {
   this->activeProxyServerList.push_back(node);
@@ -58 +57 @@
  * adds a proxy server
  */
-void NetworkNode::addPassiveProxyServer(PeerInfo* node)
+void NetworkNode::addPassiveProxyServer(NetworkNode* node)
 {
   this->passiveProxyServerList.push_back(node);
@@ -66 +65 @@
  * adds a master server
  */
-void NetworkNode::addMasterServer(PeerInfo* node)
+void NetworkNode::addMasterServer(NetworkNode* node)
 {
   this->masterServerList.push_back(node);
@@ -75 +74 @@
  * removes a client
  */
-void NetworkNode::removeClient(PeerInfo* node)
-{
-  std::list<PeerInfo*>::iterator it = this->clientList.begin();
+void NetworkNode::removeClient(NetworkNode* node)
+{
+  std::list<NetworkNode*>::iterator it = this->clientList.begin();
   for(; it != this->clientList.end(); it++)
   {
@@ -94 +93 @@
  * removes a proxy server
  */
-void NetworkNode::removeActiveProxyServer(PeerInfo* node)
-{
-  std::list<PeerInfo*>::iterator it = this->activeProxyServerList.begin();
+void NetworkNode::removeActiveProxyServer(NetworkNode* node)
+{
+  std::list<NetworkNode*>::iterator it = this->activeProxyServerList.begin();
   for(; it != this->activeProxyServerList.end(); it++)
   {
@@ -113 +112 @@
  * removes a proxy server
  */
-void NetworkNode::removePassiveProxyServer(PeerInfo* node)
-{
-  std::list<PeerInfo*>::iterator it = this->passiveProxyServerList.begin();
+void NetworkNode::removePassiveProxyServer(NetworkNode* node)
+{
+  std::list<NetworkNode*>::iterator it = this->passiveProxyServerList.begin();
   for(; it != this->passiveProxyServerList.end(); it++)
   {
@@ -131 +130 @@
  * removes a master server
  */
-void NetworkNode::removeMasterServer(PeerInfo* node)
-{
-  std::list<PeerInfo*>::iterator it = this->masterServerList.begin();
+void NetworkNode::removeMasterServer(NetworkNode* node)
+{
+  std::list<NetworkNode*>::iterator it = this->masterServerList.begin();
   for(; it != this->masterServerList.end(); it++)
   {
@@ -145 +144 @@
 
   PRINTF(2)("Could not remove client from the list, very strange...");
+}
+
+
+
+
+/**
+ * removes a client
+ */
+void NetworkNode::removeClient(int userId)
+{
+  std::list<NetworkNode*>::iterator it = this->clientList.begin();
+  for(; it != this->clientList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+    {
+      this->clientList.erase(it);
+      this->playerNumber--;
+      return;
+    }
+  }
+
+  PRINTF(2)("Could not remove client from the list, very strange...");
+}
+
+/**
+ * removes a proxy server
+ */
+void NetworkNode::removeActiveProxyServer(int userId)
+{
+  std::list<NetworkNode*>::iterator it = this->activeProxyServerList.begin();
+  for(; it != this->activeProxyServerList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+    {
+      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(int userId)
+{
+  std::list<NetworkNode*>::iterator it = this->passiveProxyServerList.begin();
+  for(; it != this->passiveProxyServerList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+    {
+      this->passiveProxyServerList.erase(it);
+      return;
+    }
+  }
+
+  PRINTF(2)("Could not remove proxy server from the list, very strange...");
+}
+
+/**
+ * removes a master server
+ */
+void NetworkNode::removeMasterServer(int userId)
+{
+  std::list<NetworkNode*>::iterator it = this->masterServerList.begin();
+  for(; it != this->masterServerList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+    {
+      this->masterServerList.erase(it);
+      this->playerNumber--;
+      return;
+    }
+  }
+
+  PRINTF(2)("Could not remove client from the list, very strange...");
+}
+
+
+
+
+
+/**
+ *  gets the peer info by user id
+ * @param userId  the user id of the node to look up
+ * @return the peer info of this node NULL if nothing found
+ */
+PeerInfo* NetworkNode::getPeerByUserId( int userId)
+{
+  // look through the master server lists
+  std::list<NetworkNode*>::const_iterator it = this->masterServerList.begin();
+  for( ;it != this->masterServerList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+      return (*it)->getPeerInfo();
+  }
+
+  // look through the active proxy server list
+  it = this->activeProxyServerList.begin();
+  for( ; it != this->activeProxyServerList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+      return (*it)->getPeerInfo();
+  }
+
+  // look through the passive server list
+  it = this->passiveProxyServerList.begin();
+  for( ; it != this->passiveProxyServerList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+      return (*it)->getPeerInfo();
+  }
+
+  // look through the client list
+  it = this->clientList.begin();
+  for( ; it != this->clientList.end(); it++)
+  {
+    if( (*it)->getPeerInfo()->userId == userId)
+      return (*it)->getPeerInfo();
+  }
+
+  return NULL;
 }
 
@@ -154 +277 @@
 PeerInfo* NetworkNode::getClient(int index) const
 {
-  if( this->clientList.size() < index)
+  if( (int)this->clientList.size() < index)
     return NULL;
 
-  std::list<PeerInfo*>::const_iterator it = this->clientList.begin();
+  std::list<NetworkNode*>::const_iterator it = this->clientList.begin();
   for(int i = 0; it != this->clientList.end(); it++, i++)
   {
   if( i == index)
-    return (*it);
+    return (*it)->getPeerInfo();
   }
 
@@ -174 +297 @@
 PeerInfo* NetworkNode::getActiveProxyServer(int index) const
 {
-  if( this->activeProxyServerList.size() < index)
+  if( (int)this->activeProxyServerList.size() < index)
     return NULL;
 
-  std::list<PeerInfo*>::const_iterator it = this->activeProxyServerList.begin();
+  std::list<NetworkNode*>::const_iterator it = this->activeProxyServerList.begin();
   for(int i = 0; it != this->activeProxyServerList.end(); it++, i++)
   {
     if( i == index)
-      return (*it);
+      return (*it)->getPeerInfo();
   }
 
@@ -194 +317 @@
 PeerInfo* NetworkNode::getPassiveProxyServer(int index) const
 {
-  if( this->passiveProxyServerList.size() < index)
+  if( (int)this->passiveProxyServerList.size() < index)
     return NULL;
 
-  std::list<PeerInfo*>::const_iterator it = this->passiveProxyServerList.begin();
+  std::list<NetworkNode*>::const_iterator it = this->passiveProxyServerList.begin();
   for(int i = 0; it != this->passiveProxyServerList.end(); it++, i++)
   {
     if( i == index)
-      return (*it);
+      return (*it)->getPeerInfo();
   }
 
@@ -214 +337 @@
 PeerInfo* NetworkNode::getMasterServer(int index) const
 {
-  if( this->masterServerList.size() < index)
+  if( (int)this->masterServerList.size() < index)
     return NULL;
 
-  std::list<PeerInfo*>::const_iterator it = this->masterServerList.begin();
+  std::list<NetworkNode*>::const_iterator it = this->masterServerList.begin();
   for(int i = 0; it != this->masterServerList.end(); it++, i++)
   {
     if( i == index)
-      return (*it);
+      return (*it)->getPeerInfo();
+  }
+
+  return NULL;
+}
+
+
+
+/**
+ * searches for a given NetworkNode
+ * @param userId of the searched node
+ * @returns the PeerInfo of the userId peer
+ */
+NetworkNode* NetworkNode::getNodeByUserId( int userId)
+{
+  if( this->peerInfo->userId == userId)
+    return this;
+
+
+  NetworkNode* node = NULL;
+  std::list<NetworkNode*>::const_iterator it = this->masterServerList.begin();
+
+  for(; it != this->masterServerList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  it = this->activeProxyServerList.begin();
+  for(; it != this->activeProxyServerList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  it = this->passiveProxyServerList.begin();
+  for(; it != this->passiveProxyServerList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
+  }
+
+  it = this->clientList.begin();
+  for(; it != this->clientList.end(); it++)
+  {
+    node = (*it)->getNodeByUserId(userId);
+    if( node != NULL)
+      return node;
   }
 
@@ -234 +407 @@
 void NetworkNode::debug(int depth) const
 {
-  PRINT(0)(" = %s\n", this->peerInfo->getNodeTypeString().c_str());
-
-  PRINT(0)("    master servers: %i\n", this->masterServerList.size());
-  std::list<PeerInfo*>::const_iterator it = this->masterServerList.begin();
-  for(; it != this->masterServerList.end(); it++)
-  {
-    IP* ip = &(*it)->ip;
-    PRINT(0)("     - ms, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
-  }
-
-  PRINT(0)("    proxy servers active: %i\n", this->activeProxyServerList.size());
-  it = this->activeProxyServerList.begin();
-  for(; it != this->activeProxyServerList.end(); it++)
-  {
-    IP* ip = &(*it)->ip;
-    PRINT(0)("     - ps-a, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
-  }
-
-  PRINT(0)("    proxy servers passive: %i\n", this->passiveProxyServerList.size());
-  it = this->passiveProxyServerList.begin();
-  for(; it != this->passiveProxyServerList.end(); it++)
-  {
-    IP* ip = &(*it)->ip;
-    PRINT(0)("     - ps-p, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
-  }
-
-  PRINT(0)("    clients: %i\n", this->clientList.size());
-  it = this->clientList.begin();
-  for(; it != this->clientList.end(); it++)
-  {
-    IP* ip = &(*it)->ip;
-    PRINT(0)("     - client, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
-  }
-}
-
+  char indent[depth +1];
+  for( int i = 0; i < depth; i++) {     indent[i] = ' ';  }
+  indent[depth] = '\0';
+
+  PRINT(0)("%s + %s, with id %i and ip: %s\n", indent, this->peerInfo->getNodeTypeString().c_str(), this->peerInfo->userId, this->peerInfo->ip.ipString().c_str());
+
+
+
+  std::list<NetworkNode*>::const_iterator it;
+  if( !this->masterServerList.empty())
+  {
+    it = this->masterServerList.begin();
+
+    for(; it != this->masterServerList.end(); it++)
+    {
+      (*it)->debug(depth+1);
+    }
+  }
+
+  if( !this->activeProxyServerList.empty())
+  {
+    it = this->activeProxyServerList.begin();
+
+    for(; it != this->activeProxyServerList.end(); it++)
+    {
+      (*it)->debug(depth+1);
+    }
+  }
+
+
+  if( !this->passiveProxyServerList.empty())
+  {
+    it = this->passiveProxyServerList.begin();
+
+    for(; it != this->passiveProxyServerList.end(); it++)
+    {
+      (*it)->debug(depth+1);
+    }
+  }
+
+  if( !this->clientList.empty())
+  {
+    it = this->clientList.begin();
+
+    for(; it != this->clientList.end(); it++)
+    {
+      (*it)->debug(depth+1);
+    }
+  }
+}
+

trunk/src/lib/network/monitor/network_node.h

@@ -13 +13 @@
 #include <list>
 
-
 //!< a class representing a node in the network (this can be a MASTER_SERVER, PROXY_SERVER or a CLIENT
 class NetworkNode
@@ -22 +21 @@
 
 
-    void addClient(PeerInfo* node);
-    void addActiveProxyServer(PeerInfo* node);
-    void addPassiveProxyServer(PeerInfo* node);
-    void addMasterServer(PeerInfo* node);
+    void addClient(NetworkNode* node);
+    void addActiveProxyServer(NetworkNode* node);
+    void addPassiveProxyServer(NetworkNode* node);
+    void addMasterServer(NetworkNode* node);
 
-    void removeClient(PeerInfo* node);
-    void removeActiveProxyServer(PeerInfo* node);
-    void removePassiveProxyServer(PeerInfo* node);
-    void removeMasterServer(PeerInfo* node);
+    void removeClient(NetworkNode* node);
+    void removeActiveProxyServer(NetworkNode* node);
+    void removePassiveProxyServer(NetworkNode* node);
+    void removeMasterServer(NetworkNode* node);
+
+    void removeClient(int userId);
+    void removeActiveProxyServer(int userId);
+    void removePassiveProxyServer(int userId);
+    void removeMasterServer(int userId);
+
 
     PeerInfo* getClient(int index) const;
@@ -38 +43 @@
 
     /** @returns the master server list */
-    inline std::list<PeerInfo*> getMasterServer() const { return this->masterServerList; }
+    inline std::list<NetworkNode*> getMasterServers() const { return this->masterServerList; }
     /** @returns the active proxy server list */
-    inline std::list<PeerInfo*> getActiveProxyServer() const { return this->activeProxyServerList; }
+    inline std::list<NetworkNode*> getActiveProxyServers() const { return this->activeProxyServerList; }
     /** @returns the passive proxy server list */
-    inline std::list<PeerInfo*> getPassiveProxyServer() const { return this->passiveProxyServerList; }
+    inline std::list<NetworkNode*> getPassiveProxyServers() const { return this->passiveProxyServerList; }
     /** @returns the client list */
-    inline std::list<PeerInfo*> getClient() const { return this->clientList; }
+    inline std::list<NetworkNode*> getClients() const { return this->clientList; }
 
+    PeerInfo* getPeerByUserId( int userId);
 
     /** @returns the number of players */
@@ -53 +59 @@
     /** @returns the peer info of this node */
     inline PeerInfo* getPeerInfo() const { return this->peerInfo; }
+
+    NetworkNode* getNodeByUserId( int userId);
 
     void debug(int depth) const;
@@ -63 +71 @@
 
     /* network nodes directly connected to this node */
-    std::list<PeerInfo*>         clientList;                   //!< list of all clients 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)
+    std::list<NetworkNode*>         clientList;                   //!< list of all clients in the network
+    std::list<NetworkNode*>         activeProxyServerList;        //!< list of all proxy servers in the network
+    std::list<NetworkNode*>         passiveProxyServerList;       //!< list of all proxy servers in the network
+    std::list<NetworkNode*>         masterServerList;             //!< list of all master servers in the network (should be 1!! :D)
 
 };

trunk/src/lib/network/monitor/network_stats_widget.cc

@@ -18 +18 @@
 #include "network_stats_widget.h"
 #include "network_monitor.h"
+#include "peer_info.h"
 
 #include "multi_type.h"
@@ -23 +24 @@
 #include "shell_command.h"
 
-// SHELL_COMMAND(gui, NetworkMonitor, toggleGUI)
-//  ->setAlias("ProxyGui");
+#include "loading/resource_manager.h"
+
+// this fcuk does not work!
+// SHELL_COMMAND(gui, NetworkStatsWidget, toggleGUI)
+// ->setAlias("ProxyGui");
 
 
@@ -30 +34 @@
     : GLGuiBox(OrxGui::Horizontal)
 {
+  this->init();
+
   this->setName(name);
   this->setIP(ip);
 
+}
+
+HostWidget::HostWidget(const PeerInfo* peerInfo)
+    : GLGuiBox(OrxGui::Horizontal)
+{
+  this->init();
+  if (peerInfo == NULL)
+  {
+    this->setName("INVALID");
+    return;
+  }
+  this->setName(peerInfo->getNodeTypeString() + "ID: " + MultiType(peerInfo->userId).getString());
+  this->setIP(peerInfo->ip);
+}
+
+void HostWidget::init()
+{
+  if(_font == NULL)
+    _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
+
+  //this->_name.setFont(*_font);
+  this->_name.setTextSize(15);
+  //this->_ip.setFont(*_font);
+  this->_ip.setTextSize(15);
+
   this->pack(&this->_name);
   this->pack(&this->_ip);
@@ -49 +80 @@
 }
 
+Font* HostWidget::_font = NULL;
+
+
 
 
@@ -54 +88 @@
 
 
-ProxyWidget::ProxyWidget(const std::string& proxyName, const IP& ip)
+NodeWidget::NodeWidget(const std::string& proxyName, const IP& ip)
     : _proxyWidget(proxyName, ip)
 {
-  this->_clientNameWidth = 100.0f;
+  this->_nodeNameWidth = 100.0f;
   this->pack(&_proxyWidget);
 }
 
-void ProxyWidget::addClient(const std::string& name, const IP& ip)
+NodeWidget::NodeWidget(const NetworkNode* node)
+    : _proxyWidget(node->getPeerInfo())// "node", node->getPeerInfo()->ip)
+{
+  this->_nodeNameWidth = 100.0f;
+  this->pack(&_proxyWidget);
+
+  std::list<NetworkNode*> list = node->getMasterServers();
+  std::list<NetworkNode*>::const_iterator it;
+
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
+
+  list = node->getActiveProxyServers();
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
+
+  list = node->getPassiveProxyServers();
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
+
+  list = node->getClients();
+  for(it = list.begin(); it != list.end(); it++)
+    this->addNode(*it);
+}
+
+
+void NodeWidget::addNode(const NetworkNode* node)
+{
+  this->_nodes.push_back(new NodeWidget(node));
+  this->pack(this->_nodes.back());
+  this->_nodes.back()->show();
+}
+
+
+void NodeWidget::addNode(const std::string& name, const IP& ip)
 {
   HostWidget* newClient = new HostWidget(name, ip);
-  newClient->setNameWidth(this->_clientNameWidth);
+  newClient->setNameWidth(this->_nodeNameWidth);
 
   this->pack(newClient);
@@ -72 +140 @@
 }
 
-bool ProxyWidget::removeClient(const IP& ip)
-{
-  std::vector<HostWidget*>::iterator rmIt;
-  for(rmIt = this->_clients.begin(); rmIt != this->_clients.end(); ++rmIt)
-  {
-    if (*(*rmIt) == ip)
-    {
-      delete (*rmIt);
-      this->_clients.erase(rmIt);
-      return true;
-    }
-  }
-  return false;
-}
-
-bool ProxyWidget::removeClient(const std::string& name)
-{
-  std::vector<HostWidget*>::iterator rmIt;
-  for(rmIt = this->_clients.begin(); rmIt != this->_clients.end(); ++rmIt)
-  {
-    if (*(*rmIt) == name)
-    {
-      delete (*rmIt);
-      this->_clients.erase(rmIt);
-      return true;
-    }
-  }
-  return false;
-
-}
-
-bool ProxyWidget::removeClient(const std::string& name, const IP& ip)
-{
-  std::vector<HostWidget*>::iterator rmIt;
-  for(rmIt = this->_clients.begin(); rmIt != this->_clients.end(); ++rmIt)
-  {
-    if (*(*rmIt) == ip && *(*rmIt) == name)
-    {
-      delete (*rmIt);
-      this->_clients.erase(rmIt);
-      return true;
-    }
-  }
-  return false;
-}
-
-
-void ProxyWidget::setClientNameWidths(float width)
-{
-  this->_clientNameWidth = width;
-  for (unsigned int i = 0; i < this->_clients.size(); ++i)
-    this->_clients[i]->setNameWidth(width);
-}
-
-void ProxyWidget::hiding()
+bool NodeWidget::removeNode(const IP& ip)
+{
+//   std::vector<HostWidget*>::iterator rmIt;
+//   for(rmIt = this->_nodes.begin(); rmIt != this->_nodes.end(); ++rmIt)
+//   {
+//     if (*(*rmIt) == ip)
+//     {
+//       delete (*rmIt);
+//       this->_nodes.erase(rmIt);
+//       return true;
+//     }
+//   }
+//   return false;
+}
+
+bool NodeWidget::removeNode(const std::string& name)
+{
+//   std::vector<HostWidget*>::iterator rmIt;
+//   for(rmIt = this->_nodes.begin(); rmIt != this->_nodes.end(); ++rmIt)
+//   {
+//     if (*(*rmIt) == name)
+//     {
+//       delete (*rmIt);
+//       this->_nodes.erase(rmIt);
+//       return true;
+//     }
+//   }
+//   return false;
+
+}
+
+bool NodeWidget::removeNode(const std::string& name, const IP& ip)
+{
+//   std::vector<HostWidget*>::iterator rmIt;
+//   for(rmIt = this->_nodes.begin(); rmIt != this->_nodes.end(); ++rmIt)
+//   {
+//     if (*(*rmIt) == ip && *(*rmIt) == name)
+//     {
+//       delete (*rmIt);
+//       this->_nodes.erase(rmIt);
+//       return true;
+//     }
+//   }
+//   return false;
+}
+
+
+void NodeWidget::setNodeNameWidths(float width)
+{
+/*  this->_nodeNameWidth = width;
+  for (unsigned int i = 0; i < this->_nodes.size(); ++i)
+    this->_nodes[i]->setNameWidth(width);*/
+}
+
+void NodeWidget::hiding()
 {
   this->_proxyWidget.hide();
-  for (unsigned int i = 0; i < this->_clients.size(); ++i)
-    this->_clients[i]->hide();
-}
-
-void ProxyWidget::showing()
+  for (unsigned int i = 0; i < this->_nodes.size(); ++i)
+    this->_nodes[i]->hide();
+}
+
+void NodeWidget::showing()
 {
   this->_proxyWidget.show();
-  for (unsigned int i = 0; i < this->_clients.size(); ++i)
-    this->_clients[i]->show();
+  for (unsigned int i = 0; i < this->_nodes.size(); ++i)
+    this->_nodes[i]->show();
 }
 
@@ -147 +215 @@
  */
 NetworkStatsWidget::NetworkStatsWidget(const NetworkMonitor* monitor)
-    : GLGuiBox(OrxGui::Vertical), _thisHost("myName", IP(127, 0, 0 , 1))
+    : OrxGui::GLGuiFixedpositionBox(OrxGui::Center, OrxGui::Vertical), _thisHost("myName", IP(127, 0, 0 , 1))
 {
   this->_monitor = monitor;
+  this->_passedTime = 0.0f;
 
   /*
@@ -169 +238 @@
   this->_bar.setChangedValueColor(Color::black);
   */
+  this->_thisHostIs.setText(std::string("I am ") + _monitor->getLocalNode()->getPeerInfo()->getNodeTypeString());
+
+  this->pack(&this->_thisHostIs);
+
   this->pack(&this->_thisHost);
+
+  this->pack(&this->_serverBox);
 
   this->pack(&this->_upstreamText);
   this->pack(&this->_downstreamText);
 
-  this->pack(&this->_serverIP);
+
+  this->rebuild();
 }
 
@@ -183 +259 @@
 NetworkStatsWidget::~NetworkStatsWidget ()
 {}
+
+
+void NetworkStatsWidget::addNode(const NetworkNode* node)
+{
+  this->_proxies.push_back(new NodeWidget(node));
+  this->_serverBox.pack(this->_proxies.back());
+  this->_proxies.back()->show();
+}
+
+
+
+
+NetworkStatsWidget* NetworkStatsWidget::_statsWidget = NULL;
+
+#include "class_list.h"
+
+void NetworkStatsWidget::toggleGUI()
+{
+  BaseObject* bo = NULL;
+  const std::list<BaseObject*>* ls = ClassList::getList(CL_NETWORK_MONITOR);
+  if (ls != NULL && !ls->empty())
+    bo = ls->front();
+
+  if (bo != NULL && NetworkStatsWidget::_statsWidget == NULL)
+  {
+    NetworkStatsWidget::_statsWidget = new NetworkStatsWidget(dynamic_cast<NetworkMonitor*> (bo));
+    NetworkStatsWidget::_statsWidget->showAll();
+  }
+  else
+  {
+    delete NetworkStatsWidget::_statsWidget;
+    NetworkStatsWidget::_statsWidget = NULL;
+  }
+}
 
 
@@ -204 +314 @@
 
 
+void NetworkStatsWidget::addProxy(const std::string& name, const IP& proxy)
+{}
+
+void NetworkStatsWidget::clearProxies()
+{}
+
+
+void NetworkStatsWidget::rebuild()
+{
+  while (!this->_proxies.empty())
+  {
+    delete this->_proxies.back();
+    this->_proxies.pop_back();
+  }
+
+  const NetworkNode* node = this->_monitor->getLocalNode();
+  if (node == NULL)
+  {
+    printf("NO NODE\n");
+    return;
+  }
+
+  this->addNode(node);
+}
+
+
+
 void NetworkStatsWidget::tick(float dt)
 {
+
+  if ((_passedTime+= dt) > 1.0f)
+  {
+    this->_passedTime = 0.0f;
+    this->rebuild();
+  }
+
   assert (this->_monitor->getLocalNode() != NULL);
   assert(this->_monitor->getLocalNode()->getPeerInfo() != NULL);
@@ -220 +364 @@
 void NetworkStatsWidget::resize()
 {
-  GLGuiBox::resize();
+  GLGuiFixedpositionBox::resize();
 }
 

trunk/src/lib/network/monitor/network_stats_widget.h

@@ -2 +2 @@
  * @file network_stats_widget.h
  * @brief Definition of an EnergyWidget, that displays a bar and a Text
-*/
+ */
 
 #ifndef _NETWORK_STATS_WIDGET_H
 #define _NETWORK_STATS_WIDGET_H
 
-#include "glgui_box.h"
+#include "glgui_fixedposition_box.h"
 #include "glgui_bar.h"
 #include "glgui_text.h"
+#include "glgui_pushbutton.h"
 
 #include "network/ip.h"
 
 class NetworkMonitor;
-
+class NetworkNode;
+class PeerInfo;
 
 class HostWidget : public OrxGui::GLGuiBox
@@ -20 +22 @@
   public:
     HostWidget(const std::string& name, const IP& ip);
-    ~HostWidget() {};
+    HostWidget(const PeerInfo* peerInfo);
 
     void setName(const std::string& name) { this->_name.setText(name); };
-    void setIP(const IP& ip) { this->_ip.setText(ip.ipString()); this->_storedIP = ip; };
+    void setIP(const IP& ip) { this->_ip.setText(std::string("at ") + ip.ipString()); this->_storedIP = ip; };
 
     void setNameWidth(float width) { this->_name.setLineWidth(width); };
@@ -35 +37 @@
 
   private:
+    void init();
+  private:
     OrxGui::GLGuiText _name;           //!< The Name of the Proxy server to be displayed.
     OrxGui::GLGuiText _ip;             //!< The IP of the proxy server.
     IP                _storedIP;       //!< The ip to compare.
+
+    static Font*      _font;
 };
 
 
-class ProxyWidget : public OrxGui::GLGuiBox
+class NodeWidget : public OrxGui::GLGuiBox
 {
   public:
-    ProxyWidget(const std::string& proxyName, const IP& ip);
+    NodeWidget(const std::string& proxyName, const IP& ip);
+    NodeWidget(const NetworkNode* node);
 
-    void addClient(const std::string& name, const IP& ip);
+    void addNode(const NetworkNode* node);
+    void addNode(const std::string& name, const IP& ip);
 
-    bool removeClient(const IP& ip);
-    bool removeClient(const std::string& name);
-    bool removeClient(const std::string& name, const IP& ip);
+    bool removeNode(const IP& ip);
+    bool removeNode(const std::string& name);
+    bool removeNode(const std::string& name, const IP& ip);
 
-    void setClientNameWidths(float width);
+    void setNodeNameWidths(float width);
 
 
@@ -63 +71 @@
     HostWidget                _proxyWidget;
 
-    std::vector<HostWidget*>  _clients;
-    float                     _clientNameWidth;
+    std::vector<NodeWidget*>  _nodes;
+    float                     _nodeNameWidth;
 };
 
@@ -71 +79 @@
 
 //! A class to display network Statistics.
-class NetworkStatsWidget : public OrxGui::GLGuiBox
+class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
 {
   public:
+    static void toggleGUI();
+
     NetworkStatsWidget(const NetworkMonitor* monitor);
     virtual ~NetworkStatsWidget();
@@ -84 +94 @@
 
     void addProxy(const std::string& name, const IP& proxy);
+    void addNode(const NetworkNode* node);
 
+    void clearProxies();
+
+    void rebuild();
 
     //void rebuildConnectedHosts(std::vector<hosts> hosts);
@@ -101 +115 @@
     const NetworkMonitor*  _monitor;
 
+    OrxGui::GLGuiText      _thisHostIs;
     HostWidget             _thisHost;
 
@@ -106 +121 @@
     OrxGui::GLGuiText      _downstreamText;
 
-    std::vector<HostWidget*>_connectedProxies;
+    OrxGui::GLGuiBox       _serverBox;
 
-    OrxGui::GLGuiText       _serverIP;
+    std::vector<NodeWidget*> _proxies;
 
 
+    static NetworkStatsWidget*    _statsWidget;
+
+
+    float                   _passedTime;
     //OrxGui::GLGuiText       _valueText;
     //OrxGui::GLGuiBar        _bar;