Changeset 9470 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 25, 2006, 10:23:17 PM (18 years ago)

Author:

patrick

Message:

heavy permissions fight: no node was ever thought to be client and server at the same time, proxy server are hybrid nodes so there is need for a big framework extension.

• made the obb creation saver
• prevented segfaults in the aabb tree creation, this was very dangerous code
• inserted handshake hack to make the handshake work.

No I will have to get the handshake right so the node works correctly

File:

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

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

@@ -208 +208 @@
  * @param port: the port number
  */
-void NetworkStream::connectToProxyServer(int proxyId,std::string host, int port)
+void NetworkStream::connectToProxyServer(int proxyId, std::string host, int port)
 {
   PRINTF(0)("connect to proxy %s, this is proxyId %i\n", host.c_str(), proxyId);
@@ -253 +253 @@
 void NetworkStream::startHandshake(int userId)
 {
-  Handshake* hs = new Handshake(this->pInfo->nodeType);
+  Handshake* hs = new Handshake(NET_CLIENT/* this->pInfo->nodeType*/);
   // fake the unique id
   hs->setUniqueID( NET_UID_HANDSHAKE );
@@ -323 +323 @@
     this->updateConnectionList();
   }
-  else if( this->pInfo->isProxyServerActive())
-  {
+//   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();
-  }
+
+//     if ( this->clientSocket )
+//       this->clientSocket->update();
+//     if( this->proxySocket)
+//       this->proxySocket->update();
+//
+//     this->updateConnectionList();
+//   }
   else
   {
@@ -554 +555 @@
           {
             // make sure this is a client
-            if( this->pInfo->isClient())
+            if( this->pInfo->isClient() || SharedNetworkData::getInstance()->isProxyServerActive())
             {
               SharedNetworkData::getInstance()->setHostID( it->second.handshake->getHostId() );
@@ -752 +753 @@
 
       // if we are a server (both master and proxy servers) and this is not our handshake
-      if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive() ) && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+      if ( ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ ) && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
         continue;
 
@@ -766 +767 @@
 
       // server fakes uniqueid == 0 for handshake
-      if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive() ) &&
+      if ( ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive() */) &&
              sync.getUniqueID() <= SharedNetworkData::getInstance()->getMaxPlayer() + 1) // plus one to handle one client more than the max to redirect it
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
@@ -818 +819 @@
     // now compress the data with the zip library
     int compLength = 0;
-    if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+    if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
       compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictServer );
     else
@@ -936 +937 @@
 
           // if the node we got this unknown sync from is a client we ignore it (since it has no rights to create a new sync)
-          if ( peers[peer->second.userId].isClient() )
+          if ( peers[peer->second.userId].isClient() || peers[peer->second.userId].isProxyServerActive())
           {
             offset += syncDataLength;