new operation queue for limiting overlay connects

[oweals/gnunet.git] / src / transport / test_transport_api_limited_sockets.c

diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index 015c28c161070b994aebd6c026173c983b092bfb..e3c294a1c8ab6a58f811e3caa3a592138cef337d 100644 (file)
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file transport/test_transport_api.c
+ * @file transport/test_transport_api_limited_sockets.c
  * @brief base test case for transport implementations
  *
  * This test case serves as a base for tcp, udp, and udp-nat
@@ -27,22 +27,9 @@
  * C code apparently.
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
-#include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
-#define START_ARM GNUNET_YES
-
 /**
  * How long until we give up on transmitting the message?
  */
@@ -69,19 +56,19 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static GNUNET_SCHEDULER_TaskIdentifier send_task;
 
-struct PeerContext *p1;
+static struct PeerContext *p1;
 
-struct PeerContext *p2;
+static struct PeerContext *p2;
 
 static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
 
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
-char *cfg_file_p1;
+static char *cfg_file_p1;
 
-char *cfg_file_p2;
+static char *cfg_file_p2;
 
 #if VERBOSE
 #define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
@@ -107,6 +94,8 @@ end ()
 
   GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
   GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+  GNUNET_TRANSPORT_TESTING_done (tth);
+
 }
 
 static void
@@ -131,6 +120,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (p2 != NULL)
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
 
+  if (NULL != th)
+    GNUNET_TRANSPORT_TESTING_done (tth);
+
   ok = GNUNET_SYSERR;
 }
 
@@ -228,7 +220,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
 }
 
-void
+static void
 start_cb (struct PeerContext *p, void *cls)
 {
   static int started;
@@ -241,7 +233,7 @@ start_cb (struct PeerContext *p, void *cls)
   if (started != 2)
     return;
 
-  cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+  cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p2, p1, &testing_connect_cb,
                                                NULL);
 
 }
@@ -304,7 +296,6 @@ int
 main (int argc, char *argv[])
 {
   int ret = 0;
-  int nat_res;
 
   test_plugin = NULL;
 
@@ -321,25 +312,6 @@ main (int argc, char *argv[])
 #endif
                     NULL);
 
-  if ((test_plugin != NULL) &&
-      ((strcmp (test_plugin, "tcp_nat") == 0) ||
-       (strcmp (test_plugin, "udp_nat") == 0)))
-  {
-    nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
-    if (GNUNET_NO == nat_res)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
-                  "gnunet-nat-server", "SUID not set");
-      return 0;
-    }
-    if (GNUNET_SYSERR == nat_res)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n",
-                  "gnunet-nat-server", "file not found");
-      return 0;
-    }
-  }
-
 #if !HAVE_SETRLIMIT
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot run test on this system\n");
 
@@ -354,11 +326,10 @@ main (int argc, char *argv[])
   int res;
 
   res = getrlimit (RLIMIT_NOFILE, &r_file_old);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Maximum number of open files was: %u/%u\n", r_file_old.rlim_cur,
               r_file_old.rlim_max);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Setting maximum number of open files to: %u\n", MAX_FILES);
   r_file_new.rlim_cur = MAX_FILES;
   r_file_new.rlim_max = r_file_old.rlim_max;
@@ -387,7 +358,7 @@ main (int argc, char *argv[])
   GNUNET_free (test_name);
 
 #if HAVE_SETRLIMIT
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Restoring previous value maximum number of open files\n");
   res = setrlimit (RLIMIT_NOFILE, &r_file_old);
   if (res != 0)
@@ -396,8 +367,7 @@ main (int argc, char *argv[])
     return 0;
   }
 #endif
-
   return ret;
 }
 
-/* end of test_transport_api.c */
+/* end of test_transport_api_limited_sockets.c */