[GNUnet-SVN] r480 - in GNUnet/src: applications/tbench server

[grothoff]

Author: grothoff
Date: 2005-03-21 15:30:54 -0800 (Mon, 21 Mar 2005)
New Revision: 480

Modified:
   GNUnet/src/applications/tbench/peer1.conf
   GNUnet/src/applications/tbench/peer2.conf
   GNUnet/src/server/handler.c
Log:
fixes

Modified: GNUnet/src/applications/tbench/peer1.conf
===================================================================
--- GNUnet/src/applications/tbench/peer1.conf   2005-03-21 21:23:39 UTC (rev 
479)
+++ GNUnet/src/applications/tbench/peer1.conf   2005-03-21 23:30:54 UTC (rev 
480)
@@ -12,7 +12,7 @@
 PIDFILE         = $GNUNETD_HOME/gnunetd.pid
 HOSTS          = $GNUNETD_HOME/data/hosts/
 APPLICATIONS = "advertising topology tbench stats"
-TRANSPORTS = "http"
+TRANSPORTS = "tcp"
 
 [MODULES]
 topology = "topology_default"

Modified: GNUnet/src/applications/tbench/peer2.conf
===================================================================
--- GNUnet/src/applications/tbench/peer2.conf   2005-03-21 21:23:39 UTC (rev 
479)
+++ GNUnet/src/applications/tbench/peer2.conf   2005-03-21 23:30:54 UTC (rev 
480)
@@ -12,7 +12,7 @@
 PIDFILE         = $GNUNETD_HOME/gnunetd.pid
 HOSTS          = $GNUNETD_HOME/data/hosts/
 APPLICATIONS = "advertising topology tbench"
-TRANSPORTS  = "http"
+TRANSPORTS  = "tcp"
 
 [MODULES]
 topology = "topology_default"

Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2005-03-21 21:23:39 UTC (rev 479)
+++ GNUnet/src/server/handler.c 2005-03-21 23:30:54 UTC (rev 480)
@@ -472,9 +472,11 @@
  * (receive implementation).
  */
 void core_receive(MessagePack * mp) {
-  if ( (mainShutdownSignal != NULL) ||
+  if ( (threads_running == NO) ||
+       (mainShutdownSignal != NULL) ||
        (SYSERR == SEMAPHORE_DOWN_NONBLOCKING(bufferQueueWrite_)) ) {
-    /* discard message, buffer is full! */
+    /* discard message, buffer is full or
+       we're shut down! */
     FREE(mp->msg);
     FREE(mp);
     return;