[GNUnet-SVN] r15091 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2011-04-28 00:39:58 +0200 (Thu, 28 Apr 2011)
New Revision: 15091

Modified:
   gnunet/src/testing/testing_group.c
Log:
assertions that Nate should agree with

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2011-04-27 22:15:01 UTC (rev 15090)
+++ gnunet/src/testing/testing_group.c  2011-04-27 22:39:58 UTC (rev 15091)
@@ -3514,6 +3514,8 @@
   struct ConnectTopologyContext *ct_ctx = connect_ctx->ct_ctx;
   struct GNUNET_TESTING_PeerGroup *pg = ct_ctx->pg;
   struct PeerConnection *connection;
+
+  GNUNET_assert (0 < pg->outstanding_connects);
   pg->outstanding_connects--;
 
   /*
@@ -3535,6 +3537,7 @@
 
   if (connection != NULL) /* Can safely remove! */
     {
+      GNUNET_assert (0 < ct_ctx->remaining_connections);
       ct_ctx->remaining_connections--;
       if (pg->notify_connection != NULL) /* Notify of reverse connection */
         pg->notify_connection (pg->notify_connection_cls, second, first,
@@ -3548,7 +3551,10 @@
   if (ct_ctx->remaining_connections == 0)
     {
       if (ct_ctx->notify_connections_done != NULL)
-        ct_ctx->notify_connections_done (ct_ctx->notify_cls, NULL);
+       {
+         ct_ctx->notify_connections_done (ct_ctx->notify_cls, NULL);
+         ct_ctx->notify_connections_done = NULL;
+       }
     }
   else
     preschedule_connect (pg);