-use port numbers that are less likely to conflict with source ports

2 files changed, 10 insertions, 80 deletions

diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am
index 2011661cf..8dcb56fbd 100644
--- a/src/nse/Makefile.am
+++ b/src/nse/Makefile.am
@@ -73,6 +73,7 @@ test_nse_api_SOURCES = \
  test_nse_api.c
 test_nse_api_LDADD = \
   $(top_builddir)/src/nse/libgnunetnse.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 test_nse_multipeer_SOURCES = \
diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c
index f99cb3b03..c71d9161c 100644
--- a/src/nse/test_nse_api.c
+++ b/src/nse/test_nse_api.c
@@ -22,42 +22,15 @@
  * @brief testcase for nse_api.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_nse_service.h"
+#include "gnunet_testing_lib-new.h"
 
-#define START_ARM GNUNET_YES
 
 static struct GNUNET_NSE_Handle *h;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
-struct PeerContext
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-#if START_ARM
-  struct GNUNET_OS_Process *arm_proc;
-#endif
-};
-
-static struct PeerContext p1;
-
-
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  GNUNET_OS_process_wait (p->arm_proc);
-  GNUNET_OS_process_destroy (p->arm_proc);
-  p->arm_proc = NULL;
-#endif
-  GNUNET_CONFIGURATION_destroy (p->cfg);
-}
 
 /**
  * Signature of the main function of a task.
@@ -103,26 +76,7 @@ check_nse_message (void *cls, struct GNUNET_TIME_Absolute timestamp,
 
 
 static void
-setup_peer (struct PeerContext *p, const char *cfgname)
-{
-  p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
-  p->arm_proc =
-    GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
-                               "gnunet-service-arm",
-#if VERBOSE_ARM
-                               "-L", "DEBUG",
-#endif
-                               "-c", cfgname, NULL);
-#endif
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-
-}
-
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls, 
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   die_task =
@@ -130,47 +84,22 @@ run (void *cls, char *const *args, const char *cfgfile,
                                     (GNUNET_TIME_UNIT_MINUTES, 1), &end_test,
                                     NULL);
 
-  setup_peer (&p1, cfgfile);
   h = GNUNET_NSE_connect (cfg, &check_nse_message, cls);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to NSE service.\n");
   GNUNET_assert (h != NULL);
 }
 
 
-static int
-check ()
-{
-  int ok = 1;
-
-  char *const argv[] = { "test-nse-api",
-    "-c",
-    "test_nse.conf",
-    "-L", "WARNING",
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  GNUNET_PROGRAM_run (5, argv, "test-nse-api", "nohelp", options, &run, &ok);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping arm.\n");
-  stop_arm (&p1);
-  if (0 != ok)
-    FPRINTF (stderr, "%s",  "No information received from NSE service!\n");
-  return ok;
-}
-
-
 int
 main (int argc, char *argv[])
 {
-  int ret;
+  int ok = 1;
 
-  GNUNET_log_setup ("test_nse_api",
-                    "WARNING",
-                    NULL);
-  ret = check ();
-  return ret;
+  if (0 != GNUNET_TESTING_peer_run ("test_nse_api",
+                                    "test_nse.conf",
+                                    &run, &ok))
+    return 1;
+  return ok;
 }
 
 /* end of test_nse_api.c */