[GNUnet-SVN] r21730 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2012-06-02 18:58:55 +0200 (Sat, 02 Jun 2012)
New Revision: 21730

Modified:
   gnunet/src/util/server.c
Log:
-hopefully fixing #2390

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2012-06-02 14:39:13 UTC (rev 21729)
+++ gnunet/src/util/server.c    2012-06-02 16:58:55 UTC (rev 21730)
@@ -819,7 +819,7 @@
 
   GNUNET_break (0 != client->warn_type); /* type should never be 0 here, as we 
don't use 0 */
   client->warn_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
                                     &warn_no_receive_done, client);
   if (0 == (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
     LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -902,12 +902,13 @@
         }
         if (NULL != sender)
         {
-          if (0 == sender->suspended)
+          if ( (0 == sender->suspended) &&
+              (GNUNET_SCHEDULER_NO_TASK == sender->warn_task) )
           {
            GNUNET_break (0 != type); /* type should never be 0 here, as we 
don't use 0 */
-            sender->warn_start = GNUNET_TIME_absolute_get ();
+            sender->warn_start = GNUNET_TIME_absolute_get ();      
             sender->warn_task =
-                GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
                                               &warn_no_receive_done, sender);
             sender->warn_type = type;
           }