Changeset 9367 in orxonox.OLD

Timestamp:

Jul 20, 2006, 6:38:25 PM (18 years ago)

Author:

patrick

Message:

removed old proxy synchronization mech

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• handshake.h (modified) (2 diffs)
• network_stream.cc (modified) (3 diffs)

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

@@ -79 +79 @@
 
 
-  this->proxyAddressesSynched = 2;
   this->proxy1 = IP(0, 0);
   this->proxy2 = IP(0, 0);

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

@@ -80 +80 @@
     inline bool redirect() { return this->redirectProxy;}
     /** @param flag: indicating if the client should be redirected */
-    inline void setRedirect(bool flag) { this->redirectProxy = flag; }
+    inline void setRedirect(bool flag) { this->redirectProxy = (int)flag; }
 
     /** @param address: the address of the proxy server 1 if any */
@@ -115 +115 @@
     int                nodeType;                              //!, the type of the network node
 
-    int                proxyAddressesSynched;                 //!< number of addresses synched
     int                redirectProxy;                         //!< true if the client should reconnect to a proxy server
     IP                 proxy1;                               //!< ip address of the first proxy (0.0.0.0 of not available)

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

@@ -350 +350 @@
     {
       peers[clientId].handshake->setProxy1Address( pi->ip);
-      PRINTF(0)("proxy1 ip set to: %s\n", pi->ip.ipString().c_str());
-      PRINTF(0)(" proxy1 ip : %i, port: %i\n", pi->ip.host(), pi->ip.port());
-    }
-
+    }
     pi = this->networkMonitor->getSecondChoiceProxy();
     if( pi != NULL)
@@ -502 +499 @@
               // get proxy 1 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy1Address(), NET_PROXY_SERVER_ACTIVE);
-              PRINTF(0)("proxy1 ip read to: %s\n", it->second.handshake->getProxy1Address().ipString().c_str());
-              PRINTF(0)(" proxy1 ip : %i, port: %i\n", it->second.handshake->getProxy1Address().host(), it->second.handshake->getProxy1Address().port());
               // get proxy 2 address and add it
               this->networkMonitor->addNode(it->second.handshake->getProxy2Address(), NET_PROXY_SERVER_ACTIVE);
@@ -869 +864 @@
         int n = sync->setStateDiff( peer->second.userId, buf+offset, syncDataLength, state, fromState );
         offset += n;
-        //NETPRINTF(0)("SSSSSEEEEETTTTT: %s %d\n",sync->getClassName(), n);
 
       }