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

[gnunet]

Author: harsha
Date: 2012-12-03 18:09:01 +0100 (Mon, 03 Dec 2012)
New Revision: 25202

Modified:
   gnunet/src/testbed/gnunet-testbed-profiler.c
   gnunet/src/testbed/test_testbed_api_controllerlink.c
Log:
- check the host compatibility check status

Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c        2012-12-03 16:59:40 UTC 
(rev 25201)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c        2012-12-03 17:09:01 UTC 
(rev 25202)
@@ -717,6 +717,17 @@
   static unsigned int hosts_checked;
 
   *hc_handle = NULL;
+  if (GNUNET_NO == status)
+  {
+    if ((NULL != host) && (NULL != GNUNET_TESTBED_host_get_hostname_ (host)))
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Host %s cannot start testbed\n"),
+           GNUNET_TESTBED_host_get_hostname_ (host));
+    else
+      LOG (GNUNET_ERROR_TYPE_ERROR, _("Testbed cannot be started on 
localhost\n"));
+    GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return;
+  }
   hosts_checked++;
   printf (_("\rChecked %u hosts"), hosts_checked);
   fflush (stdout);


Property changes on: gnunet/src/testbed/gnunet-testbed-profiler.c
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/testbed/gnunet-testbed-profiler.c:13878-14093
+/gnunet/src/testbed/test_testbed_api_3peers_3controllers.c:25201
\ No newline at end of property
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-12-03 
16:59:40 UTC (rev 25201)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-12-03 
17:09:01 UTC (rev 25202)
@@ -652,6 +652,13 @@
 host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *_host, int 
status)
 {
   hc_handle = NULL;
+  if (GNUNET_NO == status)
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot start testbed on localhost\n");
+    GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return;
+  }
   cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,
                                         NULL);  
 }


Property changes on: gnunet/src/testbed/test_testbed_api_controllerlink.c
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/testbed/test_testbed_api_controllerlink.c:13878-14093
+/gnunet/src/testbed/test_testbed_api_3peers_3controllers.c:25201
\ No newline at end of property