Changeset 7954 in orxonox.OLD for trunk/src/lib/network/network_manager.cc

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

File:

• trunk/src/lib/network/network_manager.cc (modified) (5 diffs)

trunk/src/lib/network/network_manager.cc

@@ -28 +28 @@
 #include "shared_network_data.h"
 #include "network_stream.h"
+#include "preferences.h"
+#include "network_log.h"
 
 
@@ -52 +54 @@
   this->defaultSyncStream = NULL;
   this->sharedNetworkData = SharedNetworkData::getInstance();
+  this->elapsedTime = 0.0f;
+  
+    
+  int port = Preferences::getInstance()->getInt( "network", "telnetport", 0 );
+  
+  if ( port > 0 )
+    NetworkLog::getInstance()->listen( port );
 
   PRINTF(0)("NetworkManager created\n");
@@ -72 +81 @@
   this->netStreamList = ClassList::getList(CL_SYNCHRONIZEABLE);
   PRINTF(0)("NetworkManager initzalized\n");
+
 }
 
@@ -90 +100 @@
 int NetworkManager::establishConnection(const std::string & name, unsigned int port)
 {
-  IPaddress ipAddress;
-  int error = SDLNet_ResolveHost(&ipAddress, name.c_str(), port);
-  if( error == -1) {
-    printf("\n\nerror on address resolution, program inconsistency\n\n");
-    return -1;
-  }
-
-  this->defaultSyncStream = new NetworkStream(ipAddress);
+  this->defaultSyncStream = new NetworkStream( name, port );
   this->sharedNetworkData->setDefaultSyncStream(this->defaultSyncStream);
   this->defaultSyncStream->startHandshake();
@@ -130 +133 @@
 /**
  *  sync the network
+ *  @param dtS: the seceonds elapsed since the last synchronize call
  */
-void NetworkManager::synchronize()
+void NetworkManager::synchronize( float dtS)
 {
+  this->elapsedTime += dtS;
+  if( likely(this->elapsedTime < 1.0f / NETWORK_FREQUENCY))
+    return;
+  this->elapsedTime = 0.0f;
+
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {