X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api_reliability.c;h=18971a986218950e7dc1984edec24c767c73134f;hb=aa390e34b0b9e793e1c9f82a606ad0c10fcc84ca;hp=008bb9019b7e858284e214aa8b5eb99678430ead;hpb=5746309cb4be2073d550ad7a6885e918631dbc38;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 008bb9019..18971a986 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -44,10 +44,22 @@
 
 #define START_ARM GNUNET_YES
 
+/**
+ * Testcase timeout
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+
+
+static char *test_source;
+
+static char *test_plugin;
+
+static char *test_name;
 
 static int ok;
 
@@ -109,16 +121,17 @@ end ()
 {
   unsigned long long delta;
 
-  //char *value_name;
+  char *value_name;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
 
   delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
   fprintf (stderr, "\nThroughput was %llu kb/s\n",
            total_bytes * 1000 / 1024 / delta);
-  //GNUNET_asprintf(&value_name, "reliable_%s", test_name);
-  //GAUGER ("TRANSPORT", value_name, (int)(total_bytes * 1000 / 1024 /delta), "kb/s");
-  //GNUNET_free(value_name);
+  GNUNET_asprintf (&value_name, "reliable_%s", test_plugin);
+  GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta),
+          "kb/s");
+  GNUNET_free (value_name);
 
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (die_task);
@@ -244,13 +257,18 @@ notify_ready (void *cls, size_t size, void *buf)
   unsigned int s;
   unsigned int ret;
 
+  th = NULL;
   if (buf == NULL)
   {
-    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Timeout occurred while waiting for transmit_ready\n");
+    if (GNUNET_SCHEDULER_NO_TASK != die_task)
+      GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     ok = 42;
     return 0;
   }
-  th = NULL;
+
   ret = 0;
   s = get_size (n);
   GNUNET_assert (size >= s);
@@ -283,8 +301,8 @@ notify_ready (void *cls, size_t size, void *buf)
   {
     if (th == NULL)
       th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0,
-                                                   TIMEOUT, &notify_ready,
-                                                   NULL);
+                                                   TIMEOUT_TRANSMIT,
+                                                   &notify_ready, NULL);
     msg_scheduled = n;
   }
   if (n % 5000 == 0)
@@ -341,7 +359,8 @@ sendtask ()
 {
   start_time = GNUNET_TIME_absolute_get ();
   th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0), 0,
-                                               TIMEOUT, &notify_ready, NULL);
+                                               TIMEOUT_TRANSMIT, &notify_ready,
+                                               NULL);
 }
 
 static void
@@ -370,13 +389,22 @@ run (void *cls, char *const *args, const char *cfgfile,
                                             &notify_connect, &notify_disconnect,
                                             NULL);
 
+  if ((p1 == NULL) || (p2 == NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+    if (die_task != GNUNET_SCHEDULER_NO_TASK)
+      GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
+
   GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
 }
 
 static int
 check ()
 {
-  static char *const argv[] = { "test-transport-api",
+  static char *argv[] = { "test_transport",
     "-c",
     "test_transport_api_data.conf",
 #if VERBOSE
@@ -392,129 +420,24 @@ check ()
   setTransportOptions ("test_transport_api_data.conf");
 #endif
   ok = 1;
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                      "test-transport-api", "nohelp", options, &run, &ok);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
+                      "nohelp", options, &run, &ok);
 
   return ok;
 }
 
-/**
- * Return the actual path to a file found in the current
- * PATH environment variable.
- *
- * @param binary the name of the file to find
- */
-static char *
-get_path_from_PATH (char *binary)
-{
-  char *path;
-  char *pos;
-  char *end;
-  char *buf;
-  const char *p;
-
-  p = getenv ("PATH");
-  if (p == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("PATH environment variable is unset.\n"));
-    return NULL;
-  }
-  path = GNUNET_strdup (p);     /* because we write on it */
-  buf = GNUNET_malloc (strlen (path) + 20);
-  pos = path;
-
-  while (NULL != (end = strchr (pos, PATH_SEPARATOR)))
-  {
-    *end = '\0';
-    sprintf (buf, "%s/%s", pos, binary);
-    if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
-    {
-      GNUNET_free (path);
-      return buf;
-    }
-    pos = end + 1;
-  }
-  sprintf (buf, "%s/%s", pos, binary);
-  if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
-  {
-    GNUNET_free (path);
-    return buf;
-  }
-  GNUNET_free (buf);
-  GNUNET_free (path);
-  return NULL;
-}
-
-/**
- * Check whether the suid bit is set on a file.
- * Attempts to find the file using the current
- * PATH environment variable as a search path.
- *
- * @param binary the name of the file to check
- *
- * @return GNUNET_YES if the binary is found and
- *         can be run properly, GNUNET_NO otherwise
- */
-static int
-check_gnunet_nat_binary (char *binary)
-{
-  struct stat statbuf;
-  char *p;
-
-#ifdef MINGW
-  SOCKET rawsock;
-#endif
-
-#ifdef MINGW
-  char *binaryexe;
-
-  GNUNET_asprintf (&binaryexe, "%s.exe", binary);
-  p = get_path_from_PATH (binaryexe);
-  free (binaryexe);
-#else
-  p = get_path_from_PATH (binary);
-#endif
-  if (p == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Could not find binary `%s' in PATH!\n"), binary);
-    return GNUNET_NO;
-  }
-  if (0 != STAT (p, &statbuf))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p,
-                STRERROR (errno));
-    GNUNET_free (p);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (p);
-#ifndef MINGW
-  if ((0 != (statbuf.st_mode & S_ISUID)) && (statbuf.st_uid == 0))
-    return GNUNET_YES;
-  return GNUNET_NO;
-#else
-  rawsock = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP);
-  if (INVALID_SOCKET == rawsock)
-  {
-    DWORD err = GetLastError ();
-
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) have failed! GLE = %d\n",
-                err);
-    return GNUNET_NO;           /* not running as administrator */
-  }
-  closesocket (rawsock);
-  return GNUNET_YES;
-#endif
-}
-
 int
 main (int argc, char *argv[])
 {
   int ret;
+  int nat_res;
 
-  GNUNET_log_setup ("test-transport-api",
+  GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+  GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+                                                 &test_plugin);
+  GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+
+  GNUNET_log_setup (test_name,
 #if VERBOSE
                     "DEBUG",
 #else
@@ -522,55 +445,36 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  char *pch = strdup (argv[0]);
-  char *backup = pch;
-  char *filename = NULL;
-  char *dotexe;
-
-  /* get executable filename */
-  pch = strtok (pch, "/");
-  while (pch != NULL)
+  if ((strcmp (test_plugin, "tcp_nat") == 0) ||
+      (strcmp (test_plugin, "udp_nat") == 0))
   {
-    pch = strtok (NULL, "/");
-    if (pch != NULL)
-      filename = pch;
-  }
-  /* remove "lt-" */
-  filename = strstr (filename, "tes");
-  if (NULL != (dotexe = strstr (filename, ".exe")))
-    dotexe[0] = '\0';
-
-  /* create cfg filename */
-  GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
-  GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
-  GNUNET_free (backup);
-
-  if (strstr (argv[0], "tcp_nat") != NULL)
-  {
-    if (GNUNET_YES != check_gnunet_nat_binary ("gnunet-nat-server"))
+    nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+    if (GNUNET_NO == nat_res)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "`%s' not properly installed, cannot run NAT test!\n",
-                  "gnunet-nat-server");
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
+                  "gnunet-nat-server", "SUID not set");
       return 0;
     }
-  }
-  else if (strstr (argv[0], "udp_nat") != NULL)
-  {
-    if (GNUNET_YES != check_gnunet_nat_binary ("gnunet-nat-server"))
+    if (GNUNET_SYSERR == nat_res)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "`%s' not properly installed, cannot run NAT test!\n",
-                  "gnunet-nat-server");
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
+                  "gnunet-nat-server", "file not found");
       return 0;
     }
   }
 
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
+
   ret = check ();
 
   GNUNET_free (cfg_file_p1);
   GNUNET_free (cfg_file_p2);
 
+  GNUNET_free (test_source);
+  GNUNET_free (test_plugin);
+  GNUNET_free (test_name);
+
   return ret;
 }