Changeset 8623 in orxonox.OLD for trunk/src/lib/network/network_stream.cc

Timestamp:

Jun 20, 2006, 1:39:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

• trunk/src/lib/network/network_stream.cc (modified) (11 diffs)

trunk/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( "dict2p_server" );
+  assert( this->dictServer >= 0 );
 }
 
@@ -121 +125 @@
       delete i->second.handshake;
       i->second.handshake = NULL;
+    }
+    
+    if ( i->second.connectionMonitor )
+    {
+      delete i->second.connectionMonitor;
+      i->second.connectionMonitor = NULL;
     }
   }
@@ -198 +208 @@
         delete peers[0].handshake;
       peers[0].handshake = NULL;
+      
+      if ( peers[0].connectionMonitor )
+        delete peers[0].connectionMonitor;
+      peers[0].connectionMonitor = NULL;
     }
   }
@@ -282 +296 @@
       it->second.socket = NULL;
 
+      if ( it->second.connectionMonitor )
+        delete it->second.connectionMonitor;
+      it->second.connectionMonitor = NULL;
+      
       if ( it->second.handshake )
         delete it->second.handshake;
@@ -490 +508 @@
     assert( Converter::intToByteArray( offset, buf, INTSIZE ) == INTSIZE );
     
-    int compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE );
-    
-    if ( compLength < 0 )
+    int compLength = 0;
+    if ( this->isServer() )
+      compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictServer );
+    else
+      compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictClient );
+    
+    if ( compLength <= 0 )
     {
       PRINTF(1)("compression failed!\n");
@@ -501 +523 @@
     
     if ( this->remainingBytesToWriteToDict > 0 )
-      writeToNewDict( buf, offset );
+      writeToNewDict( buf, offset, true );
     
     peer->second.connectionMonitor->processUnzippedOutgoingPacket( tick, buf, offset, currentState );
@@ -538 +560 @@
       //PRINTF(0)("GGGGGOOOOOOOOOOTTTTTTTT: %d\n", compLength);
       packetLength = Zip::getInstance()->unZip( compBuf, compLength, buf, UDP_PACKET_SIZE );
-      
+
       if ( packetLength < 4*INTSIZE )
       {
@@ -547 +569 @@
       
       if ( this->remainingBytesToWriteToDict > 0 )
-        writeToNewDict( buf, packetLength );
+        writeToNewDict( buf, packetLength, false );
     
       assert( Converter::byteArrayToInt( buf, &length ) == INTSIZE );
@@ -556 +578 @@
       offset = 4*INTSIZE;
       
-      peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, offset, state, ackedState );
+      peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, packetLength, state, ackedState );
 
       //NETPRINTF(n)("got packet: %d, %d\n", length, packetLength);
@@ -729 +751 @@
  * @param length length
  */
-void NetworkStream::writeToNewDict( byte * data, int length )
+void NetworkStream::writeToNewDict( byte * data, int length, bool upstream )
 {
   if ( remainingBytesToWriteToDict <= 0 )
@@ -739 +761 @@
   std::string fileName = ResourceManager::getInstance()->getDataDir();
   fileName += "/dicts/newdict";
+  
+  if ( upstream )
+    fileName += "_upstream";
+  else
+    fileName += "_downstream";
   
   FILE * f = fopen( fileName.c_str(), "a" );