Changeset 9248 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 12, 2006, 10:35:26 AM (18 years ago)

Author:

patrick

Message:

starting switch to multiple server states (proxy, master, client,..)

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (6 diffs)

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

@@ -52 +52 @@
 
 
+/**
+ * empty constructor
+ */
 NetworkStream::NetworkStream()
     : DataStream()
@@ -62 +65 @@
 
 /**
- * connect to a server as a client
+ * start as a client, connect to a server
  *  @param host: host name (address)
  *  @param port: port number
@@ -83 +86 @@
 NetworkStream::NetworkStream( int port )
 {
-  this->type = NET_SERVER;
+  this->type = NET_MASTER_SERVER;
   this->init();
   this->serverSocket = new UdpServerSocket(port);
@@ -100 +103 @@
   this->serverSocket = NULL;
   this->networkGameManager = NULL;
-  myHostId = 0;
-  currentState = 0;
+  this->myHostId = 0;
+  this->currentState = 0;
 
   remainingBytesToWriteToDict = Preferences::getInstance()->getInt( "compression", "writedict", 0 );
@@ -373 +376 @@
 void NetworkStream::debug()
 {
-  if( this->isServer())
+  if( this->isMasterServer())
     PRINT(0)(" Host ist Server with ID: %i\n", this->myHostId);
   else
@@ -524 +527 @@
 
       // server fakes uniqueid == 0 for handshake
-      if ( this->isServer() && sync.getUniqueID() < MAX_CONNECTIONS - 1 )
+      if ( this->isMasterServer() && sync.getUniqueID() < MAX_CONNECTIONS - 1 )
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
       else