1 files changed, 24 insertions, 4 deletions

diff --git a/src/testing/test_testing_group_remote.c b/src/testing/test_testing_group_remote.c
index a58a1234e..a0ef63847 100644
--- a/src/testing/test_testing_group_remote.c
+++ b/src/testing/test_testing_group_remote.c
@@ -88,13 +88,13 @@ my_cb (void *cls,
   peers_left--;
   if (peers_left == 0)
     {
-      GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+      //GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
       ok = 0;
     }
   else if (peers_failed == peers_left)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n");
-      GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+      //GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
     }
 }
 
@@ -113,6 +113,7 @@ run (void *cls,
   char *buf;
   char *data;
   int count;
+  int ret;
   sched = s;
   ok = 1;
 #if VERBOSE
@@ -165,11 +166,27 @@ run (void *cls,
     while (count < frstat.st_size)
       {
         count++;
-        if (((data[count] == '\n') || (data[count] == '\0')) && (buf != &data[count]))
+        if (count >= frstat.st_size)
+          break;
+
+        /* if (((data[count] == '\n') || (data[count] == '\0')) && (buf != &data[count]))*/
+        if (((data[count] == '\n')) && (buf != &data[count]))
           {
             data[count] = '\0';
             temphost = GNUNET_malloc(sizeof(struct GNUNET_TESTING_Host));
-            temphost->hostname = buf;
+            ret = sscanf(buf, "%a[a-zA-Z0-9]@%a[a-zA-Z0-9.]:%hd", &temphost->username, &temphost->hostname, &temphost->port);
+            if (3 == ret)
+              {
+                GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Successfully read host %s, port %d and user %s from file\n", temphost->hostname, temphost->port, temphost->username);
+              }
+            else
+              {
+                GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Error reading line `%s' in hostfile\n", buf);
+                GNUNET_free(temphost);
+                buf = &data[count + 1];
+                continue;
+              }
+            /* temphost->hostname = buf; */
             temphost->next = hosts;
             hosts = temphost;
             buf = &data[count + 1];
@@ -195,11 +212,14 @@ run (void *cls,
   while (hostpos != NULL)
     {
       temphost = hostpos->next;
+      GNUNET_free(hostpos->hostname);
+      GNUNET_free(hostpos->username);
       GNUNET_free(hostpos);
       hostpos = temphost;
     }
   GNUNET_free_non_null(data);
   GNUNET_assert (pg != NULL);
+
 }
 
 static int