[GNUnet-SVN] r2321 - GNUnet/src/transports

[grothoff]

Author: grothoff
Date: 2005-12-13 18:57:05 -0800 (Tue, 13 Dec 2005)
New Revision: 2321

Modified:
   GNUnet/src/transports/tcp.c
   GNUnet/src/transports/tcp6.c
Log:
better shrink heuristic

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2005-12-14 02:25:53 UTC (rev 2320)
+++ GNUnet/src/transports/tcp.c 2005-12-14 02:57:05 UTC (rev 2321)
@@ -511,15 +511,15 @@
     mp->size     = len - sizeof(TCPP2P_PACKET);
     mp->tsession = tsession;
 #if DEBUG_TCP
-  {
-    EncName enc;
-    
-    hash2enc(&mp->sender.hashPubKey, &enc);
-    
-    LOG(LOG_DEBUG,
-      "tcp transport received %u bytes from %s (CRC %u), forwarding to core\n",
-      mp->size, &enc, crc32N(tcpSession->rbuff, tcpSession->pos));
-  }
+    {
+      EncName enc;
+      
+      hash2enc(&mp->sender.hashPubKey, &enc);
+      
+      LOG(LOG_DEBUG,
+         "tcp transport received %u bytes from %s (CRC %u), forwarding to 
core\n",
+         mp->size, &enc, crc32N(tcpSession->rbuff, tcpSession->pos));
+    }
 #endif
     coreAPI->receive(mp);
     /* finally, shrink buffer adequately */
@@ -527,7 +527,7 @@
            &tcpSession->rbuff[len],
            tcpSession->pos - len);
     tcpSession->pos -= len;
-    if ( (tcpSession->pos * 4 < tcpSession->rsize) &&
+    if ( (tcpSession->pos + 1024 < tcpSession->rsize) &&
         (tcpSession->rsize > 4 * 1024) ) {
       /* read buffer far too large, shrink! */
       GROW(tcpSession->rbuff,

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2005-12-14 02:25:53 UTC (rev 2320)
+++ GNUnet/src/transports/tcp6.c        2005-12-14 02:57:05 UTC (rev 2321)
@@ -495,7 +495,7 @@
            &tcp6Session->rbuff[len],
            tcp6Session->pos - len);
     tcp6Session->pos -= len;   
-    if ( (tcp6Session->pos * 4 < tcp6Session->rsize) &&
+    if ( (tcp6Session->pos + 1024 < tcp6Session->rsize) &&
         (tcp6Session->rsize > 4 * 1024) ) {
       /* read buffer far too large, shrink! */
       GROW(tcp6Session->rbuff,