Changeset 9472 in orxonox.OLD

Timestamp:

Jul 25, 2006, 10:44:54 PM (18 years ago)

Author:

patrick

Message:

switching to hybrind, so far so good

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (3 diffs)

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

@@ -313 +313 @@
   }
 
-  if ( this->pInfo->isMasterServer())
+  if ( SharedNetworkData::getInstance()->isMasterServer())
   {
     // execute everytthing the master server shoudl do
@@ -323 +323 @@
     this->updateConnectionList();
   }
-//   else if( this->pInfo->isProxyServerActive())
-//   {
-    // execute everything the proxy server should do
-
-//     if ( this->clientSocket )
-//       this->clientSocket->update();
-//     if( this->proxySocket)
-//       this->proxySocket->update();
-//
-//     this->updateConnectionList();
-//   }
-  else
+  else if( SharedNetworkData::getInstance()->isProxyServerActive())
+  {
+    //execute everything the proxy server should do
+    if ( this->clientSocket )
+      this->clientSocket->update();
+    if( this->proxySocket)
+      this->proxySocket->update();
+
+    this->updateConnectionList();
+  }
+
+#warning make this more modular: every proxy/master server connection should be watched for termination
+  if( !SharedNetworkData::getInstance()->isMasterServer())
   {
     // check if the connection is ok else terminate and remove
-#warning make this more modular: every proxy/master server connection should be watched for termination
     if ( !peers.empty() && peers[NET_ID_MASTER_SERVER].socket &&
           ( !peers[NET_ID_MASTER_SERVER].socket->isOk() ||
@@ -607 +607 @@
                 }
               }
-#warning no proxys cant accept clients anymore: uncomment the following lines. (uncommented becaus the proxy probably cant connect to another server as this
-//               else if ( this->pInfo->isProxyServerActive() )
-//               {
-//                 it->second.nodeType = it->second.handshake->getRemoteNodeType();
-//                 it->second.ip = it->second.socket->getRemoteAddress();
-//
-//                 this->networkMonitor->addNode(&it->second);
-//
-//                 this->handleNewClient( it->second.userId );
-//
-//                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
-//                 {
-//                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
-//                 }
-//               }
+              else if ( SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isClient() )
+              {
+                it->second.nodeType = it->second.handshake->getRemoteNodeType();
+                it->second.ip = it->second.socket->getRemoteAddress();
+
+                this->networkMonitor->addNode(&it->second);
+
+                this->handleNewClient( it->second.userId );
+
+                if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
+                {
+                  PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
+                }
+              }
 
               PRINT(0)("handshake finished delete it\n");