Changeset 9269 in orxonox.OLD for branches

Timestamp:

Jul 13, 2006, 2:00:20 PM (18 years ago)

Author:

patrick

Message:

network node type handshake extension

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -58 +58 @@
   localState.orxId = _ORXONOX_ID;
   localState.version = _ORXONOX_VERSION;
-//   localState.nodeType =
+  localState.nodeType = NET_CLIENT;
   localState.canDel = 0;
 
@@ -69 +69 @@
   remoteState.orxId = 0;
   remoteState.version = 0;
+  remoteState.nodeType = NET_CLIENT;
   remoteState.canDel = 0;
 
@@ -85 +86 @@
   {
     // orxonox id handler
-    if ( *it == orxId_handler )
+    if ( *it == this->orxId_handler )
     {
       if ( remoteState.orxId != _ORXONOX_ID )
@@ -94 +95 @@
         continue;
       }
-
     }
 
     // orxonox version handler
-    if ( *it == version_handler )
+    if ( *it == this->version_handler )
     {
       if ( remoteState.version != _ORXONOX_VERSION )
@@ -107 +107 @@
         continue;
       }
+    }
 
+    // node type handler: for each node type there is a specific action to be taken
+    if ( *it == this->nodeTypeHandler)
+    {
+      if ( remoteState.nodeType == NET_MASTER_SERVER )
+      {
+        continue;
+      }
+      else if( remoteState.nodeType == NET_PROXY_SERVER)
+      {
+        continue;
+      }
+      else if( remoteState.nodeType == NET_CLIENT)
+      {
+        continue;
+      }
     }
+
 
     // cancel

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

@@ -43 +43 @@
     /** @returns true if no error has occured until now */
     inline bool ok(){ return localState.error == 0 && remoteState.error == 0; }
+    /** stops the handshake and reject the other side with @param reason: string describing the reason */
     inline void doReject( std::string reason ){ localState.error = 1; localState.errorString = "the server rejected your connection ["+ reason +"]"; }
     /** @returns true if the handshake is finished and the instances can be deleted */
@@ -58 +59 @@
     /** @returns the unique id of the message manager */
     inline int  getMessageManagerId(){ return remoteState.messageManagerId; }
-    /** stops the handshake and reject the other side with @param reason: string describing the reason */
+    /** @returns the node type of the remote host */
+    inline int getRemoteNodeType() { return this->remoteState.nodeType; }
 
     /** sets @param nick the prefereded nick name */

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

@@ -15 +15 @@
 class PeerInfo;
 
-class OrxGui::GLGuiBox;
+namespace OrxGui { class GLGuiBox; };
 
 class NetworkMonitor : public Synchronizeable

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

@@ -429 +429 @@
     if ( it->second.handshake )
     {
+      // handshake finished
       if ( it->second.handshake->completed() )
       {
+        //handshake is correct
         if ( it->second.handshake->ok() )
         {
           if ( !it->second.handshake->allowDel() )
           {
-            //if ( type != NET_MASTER_SERVER )
             if ( type == NET_CLIENT )
             {
@@ -453 +454 @@
           else
           {
+            // handsheke finished registring new player
             if ( it->second.handshake->canDel() )
             {