Changeset 9296 in orxonox.OLD for branches/proxy/src/lib/network

Timestamp:

Jul 14, 2006, 3:01:37 PM (18 years ago)

Author:

patrick

Message:

redirection flag added, proxy settings as a way to get/save the server settings

Location:

branches/proxy/src/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• handshake.cc (modified) (5 diffs)
• handshake.h (modified) (2 diffs)
• monitor/network_monitor.h (modified) (1 diff)
• network_stream.cc (modified) (1 diff)
• proxy (added)
• proxy/proxy_settings.cc (added)
• proxy/proxy_settings.h (added)

branches/proxy/src/lib/network/Makefile.am

@@ -25 +25 @@
                       player_stats.cc \
                       udp_broadcast.cc \
+                      \
+                      proxy/proxy_settings.cc \
                       \
                       monitor/connection_monitor.cc \
@@ -66 +68 @@
                  udp_broadcast.h \
                  \
+                 proxy/proxy_settings.cc \
+                 \
                  monitor/connection_monitor.h \
                  monitor/network_monitor.h \

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

@@ -47 +47 @@
   registerVar( new SynchronizeableString( &localState.preferedNickName, &remoteState.preferedNickName, "preferedNickName", PERMISSION_ALL ) );
   registerVar( new SynchronizeableIP( &localState.proxy1, &remoteState.proxy1, "proxy server 1", PERMISSION_ALL ) );
+  registerVar( new SynchronizeableIP( &localState.proxy2, &remoteState.proxy1, "proxy server 2", PERMISSION_ALL ) );
 
   // init the local state
@@ -59 +60 @@
   localState.nodeType = nodeType;
   localState.canDel = 0;
+  localState.redirectProxy = 0;
 
   remoteState.completed = 0;
@@ -70 +72 @@
   remoteState.nodeType = NET_CLIENT;
   remoteState.canDel = 0;
+  remoteState.redirectProxy = 0;
 
   // activate the synchronization process
@@ -75 +78 @@
   PRINTF(0)("Handshake created clientId = %d\n", clientId);
 }
+
 
 /**
@@ -125 +129 @@
     }
 
-
     // cancel
     if ( *it == candel_id )

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

@@ -31 +31 @@
   std::string   preferedNickName;              //!< prefered nick name
 
-  int           freeSlots;                     //!< true if there are still free slots on this server
+  int           redirectProxy;                 //!< true if the client should reconnect to a proxy server (either 1 or 2 )
   IPaddress     proxy1;                        //!< ip address of the first proxy (0.0.0.0 of not available)
   IPaddress     proxy2;                        //!< ip address of the second proxy (0.0.0.0 of not available)
@@ -73 +73 @@
     inline std::string getPreferedNickName(){ return remoteState.preferedNickName; }
 
+    /** @returns if true the local client should reconnect to a proxy server from the proxy server list */
+    inline bool redirect() { return this->remoteState.redirectProxy;}
+
     /** @param address: the address of the proxy server 1 if any */
     inline void setProxy1Address(IPaddress address) { this->localState.proxy1 = address; }

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -56 +56 @@
     inline bool gotFreeSlots() { return (this->localNode->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
     /** @param node node to be checked for slots @returns true if there are still free network slots available at this node */
-    inline bool gorFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
+    inline bool gotFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
     void getServerWithFreeSlots() { }
 

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

@@ -191 +191 @@
 
   hs->setPreferedNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Player" ) );
+  //hs->set
 
 //   peers[0].handshake->setSynchronized( true );