[GNUnet-SVN] r29624 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2013-09-26 17:20:16 +0200 (Thu, 26 Sep 2013)
New Revision: 29624

Modified:
   gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
Log:
fixing shutdown


Modified: gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c   
2013-09-26 15:03:13 UTC (rev 29623)
+++ gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c   
2013-09-26 15:20:16 UTC (rev 29624)
@@ -149,12 +149,24 @@
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+
   die_task = GNUNET_SCHEDULER_NO_TASK;
   end ( NULL, NULL);
   ret = GNUNET_SYSERR;
 }
 
 static void
+end_badly_now ()
+{
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+}
+
+static void
 address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
                     struct Session *session,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
@@ -172,14 +184,14 @@
       if ((NULL == address) || (NULL != session))
       {
         GNUNET_break (0);
-        GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+        end_badly_now ();
         return;
       }
       if ((ntohl(bandwidth_in.value__) == 0) ||
           (ntohl(bandwidth_out.value__) == 0))
       {
         GNUNET_break (0);
-        GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+        end_badly_now ();
         return;
       }
 
@@ -210,14 +222,14 @@
       if ((NULL == address) || (NULL != session))
       {
         GNUNET_break (0);
-        GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+        end_badly_now ();
         return;
       }
       if ((ntohl(bandwidth_in.value__) == 0) ||
           (ntohl(bandwidth_out.value__) == 0))
       {
         GNUNET_break (0);
-        GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+        end_badly_now ();
         return;
       }
 
@@ -227,7 +239,7 @@
         GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Deleted 1st address for peer `%s' 
was suggested after deletion: `%s' `%s'\n",
           GNUNET_i2s (&address->peer), (char *) address->address, 
first_suggestion->address);
         GNUNET_break (0);
-        GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+        end_badly_now ();
         return;
       }
 
@@ -256,7 +268,7 @@
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Expected disconnect received 
address `%s' with bandwidth \n",
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Expected disconnect but received 
address `%s' with bandwidth \n",
           (char *) address->address);
     }
   }
@@ -295,7 +307,7 @@
   if (sched_ats == NULL)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS 
scheduling!\n");
-    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    end_badly_now ();
     return;
   }
 
@@ -303,7 +315,7 @@
   if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, 
&p.id.hashPubKey))
   {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
-      GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+      end_badly_now ();
       return;
   }
   GNUNET_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));