Changeset 9270 in orxonox.OLD for branches/proxy

Timestamp:

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

Author:

patrick

Message:

processing the node type through the framework

Location:

branches/proxy/src/lib/network

Files:

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

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

@@ -25 +25 @@
 
 
-Handshake::Handshake( bool server, int clientId, int networkGameManagerId, int messageManagerId )
+Handshake::Handshake( int nodeType, int clientId, int networkGameManagerId, int messageManagerId )
   : Synchronizeable()
 {
@@ -31 +31 @@
   this->setClassID(CL_HANDSHAKE, "Handshake");
 
-  this->setIsServer(server);
+  this->setIsServer( nodeType == NET_MASTER_SERVER);
 
   // register all variable handlers
@@ -58 +58 @@
   localState.orxId = _ORXONOX_ID;
   localState.version = _ORXONOX_VERSION;
-  localState.nodeType = NET_CLIENT;
+  localState.nodeType = nodeType;
   localState.canDel = 0;
 

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

@@ -35 +35 @@
 
   public:
-    Handshake( bool server, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );
+    Handshake( int nodeType, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );
 
 

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

@@ -64 +64 @@
   this->init();
   /* initialize the references */
-  this->type = NET_CLIENT;
+  this->nodeType = NET_CLIENT;
 }
 
@@ -75 +75 @@
 NetworkStream::NetworkStream( std::string host, int port )
 {
-  this->type = NET_CLIENT;
+  this->nodeType = NET_CLIENT;
   this->init();
   this->peers[0].socket = new UdpSocket( host, port );
@@ -90 +90 @@
 NetworkStream::NetworkStream( int port )
 {
-  this->type = NET_MASTER_SERVER;
+  this->nodeType = NET_MASTER_SERVER;
   this->init();
   this->serverSocket = new UdpServerSocket(port);
@@ -173 +173 @@
 void NetworkStream::startHandshake()
 {
-  Handshake* hs = new Handshake(false);
+  Handshake* hs = new Handshake(this->nodeType);
   hs->setUniqueID( 0 );
   assert( peers[0].handshake == NULL );
@@ -229 +229 @@
   }
 
-  if ( this->type == NET_MASTER_SERVER )
+  if ( this->nodeType == NET_MASTER_SERVER )
   {
     // execute everytthing the master server shoudl do
@@ -237 +237 @@
     this->updateConnectionList();
   }
-  else if( this->type == NET_PROXY_SERVER)
+  else if( this->nodeType == NET_PROXY_SERVER)
   {
     // execute everything the proxy server should do
@@ -292 +292 @@
       freeSocketSlots.pop_back();
       peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
+      peers[clientId].handshake = new Handshake(this->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].handshake->setUniqueID(clientId);
@@ -307 +307 @@
 
       peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
+      peers[clientId].handshake = new Handshake(this->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
@@ -437 +437 @@
           if ( !it->second.handshake->allowDel() )
           {
-            if ( type == NET_CLIENT )
+            if ( this->nodeType == NET_CLIENT )
             {
               SharedNetworkData::getInstance()->setHostID( it->second.handshake->getHostId() );
               myHostId = SharedNetworkData::getInstance()->getHostID();
+
+              PRINTF(0)("remote host is a %i\n", it->second.handshake->getRemoteNodeType());
 
               this->networkGameManager = NetworkGameManager::getInstance();
@@ -457 +459 @@
             if ( it->second.handshake->canDel() )
             {
-              if ( type == NET_MASTER_SERVER )
+              if ( this->nodeType == NET_MASTER_SERVER )
               {
                 handleNewClient( it->second.userId );

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

@@ -48 +48 @@
 
     /* functions for the localhost settings */
-    inline bool isMasterServer() const { return (this->type == NET_MASTER_SERVER)? true:false; }
-    inline bool isProxyServer() const { return (this->type == NET_PROXY_SERVER)? true:false; }
-    inline bool isClient() const { return (this->type == NET_CLIENT)? true:false; }
+    inline bool isMasterServer() const { return (this->nodeType == NET_MASTER_SERVER)? true:false; }
+    inline bool isProxyServer() const { return (this->nodeType == NET_PROXY_SERVER)? true:false; }
+    inline bool isClient() const { return (this->nodeType == NET_CLIENT)? true:false; }
 //     inline bool isActive() const { return this->bActive; }
     inline int getMaxConnections(){ return MAX_CONNECTIONS; }
@@ -88 +88 @@
     PeerList                   peers;                       //!< list of the network node informations
 
-    int                        type;                        //!< the type of this host (NET_CLIENT, NET_MASTER_SERVER,...)
+    int                        nodeType;                    //!< the type of this host (NET_CLIENT, NET_MASTER_SERVER,...)
     int                        myHostId;                    //!< the host id of the localhost