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

Timestamp:

Jul 30, 2006, 11:19:24 PM (18 years ago)

Author:

patrick

Message:

yet another weekend commit, quite much work done:

• introduced a new PERMISSION layer: PERMISSION_SERVER: the nearest server hast authority
• tightening up permissions: brand new implementation to prevent sending unused variables in the network (less smog in the net:D_
• removed some compiler warnings from some central modules
• networkmonitor interface changed to work with networknodes mainly
• better debug output for the network monitor
• networnode inteface standardisation
• force reconnection commands integration

Location:

branches/proxy/src/lib/network/proxy

Files:

• proxy_control.cc (modified) (5 diffs)
• proxy_control.h (modified) (1 diff)

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

@@ -39 +39 @@
 
 
-// SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
-SHELL_COMMAND(bla, ProxyControl, forceReconnectionShellThumb);
-
+SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
 
 /**
@@ -250 +248 @@
 void ProxyControl::forceReconnectionShell(int userId, int serverId)
 {
+  PRINTF(0)("shell reconnectoin command: %i to %i\n", userId, serverId);
+
   this->forceReconnection(userId, serverId);
 }
@@ -264 +264 @@
   if( serverInfo == NULL)
   {
-    PRINTF(0)("There is no node with userId %i registered in this network. Check the uid again\n");
-    return;
-  }
-  else if( serverInfo->isMasterServer() || serverInfo->isProxyServerActive())
-  {
-    PRINTF(0)("You can't connecto to a client (userId %i)\n", serverId);
+    PRINTF(0)("There is no server with userId %i registered in this network. Check the uid again\n", serverId);
+    return;
+  }
+  else if( serverInfo->isClient())
+  {
+    PRINTF(0)("You can't connec to to a client (userId %i)\n", serverId);
     return;
   }
@@ -306 +306 @@
   if( pInfo == NULL)
   {
-    PRINTF(0)("There is no node with userId %i registered in this network. Check the uid again\n");
+    PRINTF(0)("There is no client with userId %i registered in this network. Check the uid again\n", userId);
     return;
   }
@@ -316 +316 @@
   assert( Converter::intToByteArray( newAddress.host(), data + 2 * INTSIZE, INTSIZE ) == INTSIZE );
 
+  PRINTF(0)("Sending reconnection command to: %i\n", userId);
   MessageManager::getInstance()->sendMessage( MSGID_PROXY_COMMAND, data, 3*INTSIZE, RT_ALL_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
 }

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

@@ -18 +18 @@
 typedef enum proxyCommand {
   PXY_RECONNECT              = 0,              //!< forces a reconnection of the node
+
+  PXY_WEAKUP,                                  //!< signal to weakup a sleeping proxy server (not impl. yet)
+  PXY_SLEEP,                                   //!< signal to sleep and disconnect clients
 
   PXY_NUMBER