Changeset 9584 in orxonox.OLD

Timestamp:

Jul 28, 2006, 10:22:09 PM (18 years ago)

Author:

patrick

Message:

proxy control center now registers joining clients to the network monitor

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.h (modified) (1 diff)
• network_stream.cc (modified) (6 diffs)
• peer_info.cc (modified) (1 diff)
• peer_info.h (modified) (2 diffs)
• proxy/proxy_control.cc (modified) (4 diffs)

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

@@ -76 +76 @@
 
     inline const std::list<NetworkNode*>& getNodeList() const { return this->nodeList; };
-    inline PeerInfo* getPeerByUserId( int userId) { this->localNode->getPeerByUserId(userId); }
+    inline PeerInfo* getPeerByUserId( int userId) { return this->localNode->getPeerByUserId(userId); }
 
     void toggleGUI();

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

@@ -121 +121 @@
   this->pInfo->lastAckedState = 0;
   this->pInfo->lastRecvedState = 0;
+  this->pInfo->bLocal = true;
 
   this->bRedirect = false;
@@ -200 +201 @@
   this->peers[node].connectionMonitor = new ConnectionMonitor( NET_ID_MASTER_SERVER );
   this->peers[node].ip = this->peers[node].socket->getRemoteAddress();
+  this->peers[node].bLocal = true;
 }
 
@@ -219 +221 @@
   this->peers[proxyId].connectionMonitor = new ConnectionMonitor( proxyId );
   this->peers[proxyId].ip = this->peers[proxyId].socket->getRemoteAddress();
+  this->peers[proxyId].bLocal = true;
 }
 
@@ -257 +260 @@
   // fake the unique id
   hs->setUniqueID( NET_UID_HANDSHAKE );
-  assert( peers[userId].handshake == NULL );
-  peers[userId].handshake = hs;
+  assert( this->peers[userId].handshake == NULL );
+  this->peers[userId].handshake = hs;
+  this->peers[userId].bLocal = true;
 
   // set the preferred nick name
@@ -495 +499 @@
 {
   // create new handshake and init its variables
-  peers[userId].handshake = new Handshake(this->pInfo->nodeType, userId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
-  peers[userId].handshake->setUniqueID(userId);
-
-  peers[userId].connectionMonitor = new ConnectionMonitor( userId );
-  peers[userId].userId = userId;
+  this->peers[userId].handshake = new Handshake(this->pInfo->nodeType, userId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
+  this->peers[userId].handshake->setUniqueID(userId);
+
+  this->peers[userId].connectionMonitor = new ConnectionMonitor( userId );
+  this->peers[userId].userId = userId;
+  this->peers[userId].bLocal = true;
 
   PRINTF(0)("num sync: %d\n", synchronizeables.size());
@@ -508 +513 @@
   if( pi != NULL)
   {
-    peers[userId].handshake->setProxy1Address( pi->ip);
+    this->peers[userId].handshake->setProxy1Address( pi->ip);
   }
   pi = this->networkMonitor->getSecondChoiceProxy();
   if( pi != NULL)
-    peers[userId].handshake->setProxy2Address( pi->ip);
+    this->peers[userId].handshake->setProxy2Address( pi->ip);
 
   // check if the connecting client should reconnect to a proxy server
   if( SharedNetworkData::getInstance()->isMasterServer())
-    peers[userId].handshake->setRedirect(/*this->networkMonitor->isReconnectNextClient()*/false);
+    this->peers[userId].handshake->setRedirect(/*this->networkMonitor->isReconnectNextClient()*/false);
 
   // the connecting node of course is a client
-  peers[userId].ip = peers[userId].socket->getRemoteAddress();
+  this->peers[userId].ip = this->peers[userId].socket->getRemoteAddress();
 }
 

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

@@ -49 +49 @@
   this->lastRecvedState = 0;
   this->connectionMonitor = NULL;
+  this->bLocal = false;
 
   this->ip = IP(0,0);

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

@@ -30 +30 @@
     static const std::string& nodeTypeToString(unsigned int type);
 
+    inline bool isLocal() { return this->bLocal; }
 
 
@@ -44 +45 @@
     int                 lastRecvedState;         //!< last received state
 
+    bool                bLocal;                  //!< true if this node is localy connected to this node
+
     static const std::string nodeNames[];
 

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

@@ -18 +18 @@
 
 
-#include "player.h"
 #include "state.h"
 #include "shared_network_data.h"
 #include "network_game_manager.h"
+#include "ip.h"
+#include "peer_info.h"
 
 #include "converter.h"
@@ -77 +78 @@
 /**
  *  signals new client connected to this local proxy
+ *
+ *  byte 0 - 3     :      userId
+ *  byte 4 - 7     :      ip address (IPaddress.host)
+ *
  * @param userId userId of the new client
  */
@@ -90 +95 @@
   // and the ip as an int
   PeerInfo* pInfo = SharedNetworkData::getInstance()->getNetworkMonitor()->getPeerByUserId(userId);
-  assert( Converter::intToByteArray( userId, data, INTSIZE ) == INTSIZE );
-
-  MessageManager::getInstance()->sendMessage( MSGID_PROXY_NEWCLIENT, data, INTSIZE, RT_SERVER, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
+  assert(pInfo != NULL);
+  assert( Converter::intToByteArray( pInfo->ip.host(), data + INTSIZE, INTSIZE ) == INTSIZE );
+
+  MessageManager::getInstance()->sendMessage( MSGID_PROXY_NEWCLIENT, data, 2*INTSIZE, RT_SERVER, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
 }
 
@@ -118 +124 @@
   int newClientId = 0;
   assert( Converter::byteArrayToInt( data, &newClientId) == INTSIZE );
+  // now read the ip address
+  int ipHost = 0;
+  assert( Converter::byteArrayToInt( data + INTSIZE, &ipHost) == INTSIZE );
+
+  // register the new node at the network monitor
+  NetworkMonitor* netMon = SharedNetworkData::getInstance()->getNetworkMonitor();
+  PeerInfo* pInfo = new PeerInfo();
+  pInfo->bLocal = false;
+  pInfo->ip = IP(ipHost, 0);
+  pInfo->nodeType = NET_CLIENT;
+  netMon->addNode(pInfo);
 
   PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, newClientId);