Changeset 9468 in orxonox.OLD

Timestamp:

Jul 25, 2006, 8:45:18 PM (18 years ago)

Author:

patrick

Message:

assertion failure, becaus the proxy tried to accept the own connection

File:

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

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

@@ -326 +326 @@
   {
     // execute everything the proxy server should do
-    if ( clientSocket )
-      clientSocket->update();
+    if ( this->clientSocket )
+      this->clientSocket->update();
     if( this->proxySocket)
       this->proxySocket->update();
@@ -605 +605 @@
                 }
               }
-              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() );
-                }
-              }
+#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() );
+//                 }
+//               }
 
               PRINT(0)("handshake finished delete it\n");