[GNUnet-SVN] r4049 - in GNUnet: . src/transports src/util/network

[grothoff]

Author: grothoff
Date: 2006-12-24 17:06:24 -0800 (Sun, 24 Dec 2006)
New Revision: 4049

Modified:
   GNUnet/ChangeLog
   GNUnet/src/transports/tcp.c
   GNUnet/src/transports/tcp6.c
   GNUnet/src/transports/udp.c
   GNUnet/src/transports/udp6.c
   GNUnet/src/util/network/select.c
Log:
bugfix

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2006-12-24 05:22:15 UTC (rev 4048)
+++ GNUnet/ChangeLog    2006-12-25 01:06:24 UTC (rev 4049)
@@ -1,3 +1,6 @@
+Sun Dec 24 18:06:04 MST 2006
+       Limit memory utilization by select write queue.
+
 Sat Dec 23 22:12:17 MST 2006
        Updated various man pages and some configuration documentation.
        Fixed TCP transport (did not work with NAT if port was set to 0).

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2006-12-24 05:22:15 UTC (rev 4048)
+++ GNUnet/src/transports/tcp.c 2006-12-25 01:06:24 UTC (rev 4049)
@@ -426,7 +426,7 @@
                           &isRejected,
                           &select_close_handler,
                           NULL,
-                          0 /* memory quota */ );
+                          128 * 1024);
   return OK;
 }
 

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2006-12-24 05:22:15 UTC (rev 4048)
+++ GNUnet/src/transports/tcp6.c        2006-12-25 01:06:24 UTC (rev 4049)
@@ -398,7 +398,7 @@
                           &isRejected,
                           &select_close_handler,
                           NULL,
-                          0 /* memory quota */ );
+                          128 * 1024);
   return OK;
 }
 

Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2006-12-24 05:22:15 UTC (rev 4048)
+++ GNUnet/src/transports/udp.c 2006-12-25 01:06:24 UTC (rev 4049)
@@ -396,7 +396,7 @@
                             &isRejected,
                             &select_close_handler,
                             NULL,
-                            0 /* memory quota */ );
+                            64 * 1024);
     if (selector == NULL)
       return SYSERR;
   }

Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c        2006-12-24 05:22:15 UTC (rev 4048)
+++ GNUnet/src/transports/udp6.c        2006-12-25 01:06:24 UTC (rev 4049)
@@ -389,7 +389,7 @@
                             &isRejected,
                             &select_close_handler,
                             NULL,
-                            0 /* memory quota */ );
+                            64 * 1024);
     if (selector == NULL)
       return SYSERR;
   }

Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c    2006-12-24 05:22:15 UTC (rev 4048)
+++ GNUnet/src/util/network/select.c    2006-12-25 01:06:24 UTC (rev 4049)
@@ -944,6 +944,10 @@
     MUTEX_UNLOCK(sh->lock);
     return SYSERR;
   }
+  if (session->wsize + len > sh->memory_quota) {
+    MUTEX_UNLOCK(sh->lock);
+    return NO;
+  }
   fresh_write = (session->wsize == 0);
   GROW(session->wbuff,
        session->wsize,