Changeset 8496 in orxonox.OLD

Timestamp:

Jun 15, 2006, 10:11:56 PM (18 years ago)

Author:

rennerc

Message:

NetworkStream should use different dicts for server/client now

Location:

branches/network/src/lib/network

Files:

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

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

@@ -95 +95 @@
   remainingBytesToWriteToDict = Preferences::getInstance()->getInt( "compression", "writedict", 0 );
   
-  assert( Zip::getInstance()->loadDictionary( "testdict" ) );
+  assert( Zip::getInstance()->loadDictionary( "testdict" ) >= 0 );
+  this->dictClient = Zip::getInstance()->loadDictionary( "dict2pl_client" );
+  assert( this->dictClient >= 0 );
+  this->dictServer = Zip::getInstance()->loadDictionary( "dict2pl_server" );
+  assert( this->dictServer >= 0 );
 }
 
@@ -504 +508 @@
     assert( Converter::intToByteArray( offset, buf, INTSIZE ) == INTSIZE );
     
-    int compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE );
+    int compLength = 0;
+    if ( this->isServer() )
+      Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictServer );
+    else
+      Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictClient );
     
     if ( compLength < 0 )

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

@@ -107 +107 @@
 
     int                        remainingBytesToWriteToDict; //!< if > 0 NetworkStream will write packets to DATA/dicts/newdict
+
+    int dictServer;
+    int dictClient;
 };
 #endif /* _NETWORK_STREAM */

branches/network/src/lib/network/zip.cc

@@ -48 +48 @@
  * @return true on success
  */
-bool Zip::loadDictionary( std::string name )
+int Zip::loadDictionary( std::string name )
 {
   std::string fileName = ResourceManager::getInstance()->getDataDir();
@@ -60 +60 @@
   {
     PRINTF(1)("Could not open %d\n", fileName.c_str());
-    return false;
+    return -1;
   }
   
@@ -87 +87 @@
   PRINTF(3)("Loaded dictionary '%s' with adler = %d\n", name.c_str(), entry.adler );
   
-  return true;
+  return dicts.size()-1;
 }
 

branches/network/src/lib/network/zip.h

@@ -28 +28 @@
     inline static Zip* getInstance(void) { if (!singletonRef) singletonRef = new Zip();  return singletonRef; };
     
-    bool loadDictionary( std::string name );
+    int loadDictionary( std::string name );
     int zip( byte * from, int fromLength, byte * to, int maxLength, int dict = 0 );
     int unZip( byte * from, int fromLength, byte * to, int maxLength );