[GNUnet-SVN] r25925 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-01-28 14:39:03 +0100 (Mon, 28 Jan 2013)
New Revision: 25925

Modified:
   gnunet/src/testbed/gnunet-service-testbed_oc.c
   gnunet/src/testbed/testbed_api_testbed.c
Log:
- fix SEGFAULT while registering hosts

Modified: gnunet/src/testbed/gnunet-service-testbed_oc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_oc.c      2013-01-26 20:56:01 UTC 
(rev 25924)
+++ gnunet/src/testbed/gnunet-service-testbed_oc.c      2013-01-28 13:39:03 UTC 
(rev 25925)
@@ -1433,7 +1433,7 @@
 opstart_remote_overlay_connect (void *cls)
 {
   struct RemoteOverlayConnectCtx *rocc = cls;
-  
+
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rocc->timeout_rocc_task_id);
   rocc->tcc.op_id = rocc->op_id;
   rocc->tcc.th =
@@ -1442,7 +1442,7 @@
   if (NULL == rocc->tcc.th)
   {
     rocc->timeout_rocc_task_id =
-      GNUNET_SCHEDULER_add_now (&timeout_rocc_task, rocc);
+        GNUNET_SCHEDULER_add_now (&timeout_rocc_task, rocc);
     return;
   }
   rocc->tcc.pid = &rocc->a_id;
@@ -1538,7 +1538,7 @@
              "from local peer %u to peer %4s with hello size: %u\n",
              rocc->op_id, peer_id, GNUNET_i2s (&rocc->a_id), hsize);
   rocc->peer = peer;
-  rocc->peer->reference_cnt++;  
+  rocc->peer->reference_cnt++;
   rocc->hello = GNUNET_malloc (hsize);
   memcpy (rocc->hello, msg->hello, hsize);
   rocc->lop =
@@ -1546,7 +1546,7 @@
                                         &oprelease_remote_overlay_connect);
   /* This operation needs only 1 connection to transport */
   GNUNET_TESTBED_operation_queue_insert2_ (GST_opq_openfds, rocc->lop, 1);
-   GNUNET_TESTBED_operation_begin_wait_ (rocc->lop);
+  GNUNET_TESTBED_operation_begin_wait_ (rocc->lop);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2013-01-26 20:56:01 UTC (rev 
25924)
+++ gnunet/src/testbed/testbed_api_testbed.c    2013-01-28 13:39:03 UTC (rev 
25925)
@@ -830,8 +830,9 @@
     return;
   }
   rc->reg_handle =
-      GNUNET_TESTBED_register_host (rc->c, rc->hosts[rc->reg_hosts++],
+      GNUNET_TESTBED_register_host (rc->c, rc->hosts[rc->reg_hosts],
                                     host_registration_completion, rc);
+  rc->reg_hosts++;
 }
 
 
@@ -859,6 +860,8 @@
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed startup failed\n");
       return;
     default:
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Controller crash detected. Shutting down.\n");
       rc->cproc = NULL;
       shutdown_now (rc);
       return;
@@ -877,6 +880,7 @@
                                          rc);
   if (0 < rc->num_hosts)
   {
+    rc->reg_hosts = 0;
     rc->register_hosts_task = GNUNET_SCHEDULER_add_now (&register_hosts, rc);
     return;
   }