Changeset 9471 in orxonox.OLD

Timestamp:

Jul 25, 2006, 10:35:06 PM (18 years ago)

Author:

patrick

Message:

better now, a proxy server connected to the master server for the first time. now lets work on the hybrid mode

Location:

branches/proxy/src/lib/network

Files:

• network_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (6 diffs)

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

@@ -133 +133 @@
   this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE );
   // first connect to the master server for synchronization
-  this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 9999);
+  this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 10000);
   // start the handshake with the master server
   this->networkStream->startHandshake(NET_ID_MASTER_SERVER);

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

@@ -253 +253 @@
 void NetworkStream::startHandshake(int userId)
 {
-  Handshake* hs = new Handshake(NET_CLIENT/* this->pInfo->nodeType*/);
+  Handshake* hs = new Handshake(this->pInfo->nodeType);
   // fake the unique id
   hs->setUniqueID( NET_UID_HANDSHAKE );
@@ -399 +399 @@
       // this creates a new entry in the peers list
       peers[userId].socket = tempNetworkSocket;
+      peers[userId].nodeType = NET_CLIENT;
       this->handleConnect(userId);
 
@@ -430 +431 @@
       // this creates a new entry in the peers list
       peers[userId].socket = tempNetworkSocket;
+      peers[userId].nodeType = NET_PROXY_SERVER_ACTIVE;
       this->handleConnect(userId);
 
@@ -492 +494 @@
 
     // the connecting node of course is a client
-  peers[userId].nodeType = NET_CLIENT;
   peers[userId].ip = peers[userId].socket->getRemoteAddress();
 }
@@ -555 +556 @@
           {
             // make sure this is a client
-            if( this->pInfo->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
+            if(  SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
             {
               SharedNetworkData::getInstance()->setHostID( it->second.handshake->getHostId() );
@@ -592 +593 @@
             {
 
-              if ( this->pInfo->isMasterServer() )
+              if (  SharedNetworkData::getInstance()->isMasterServer() )
               {
                 it->second.nodeType = it->second.handshake->getRemoteNodeType();