WiP

[oweals/gnunet.git] / src / core / test_core_api_send_to_self.c

diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c
index bf2697eecb100d139fd72c1f72dd5a5266ec4d80..b287ecf05c9b19d7320e4b2bd2e1c254e2fedcf1 100644 (file)
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -35,10 +35,27 @@
  */
 static int ret;
 
+/**
+ * Handle to the cleanup task.
+ */
+GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static struct GNUNET_PeerIdentity myself;
+
+/**
+ * Configuration to load for the new peer.
+ */
+struct GNUNET_CONFIGURATION_Handle *core_cfg;
+
 /**
  * The handle to core
  */
-static struct GNUNET_CORE_Handle *core_handle;
+struct GNUNET_CORE_Handle *core;
+
+/**
+ * Handle to gnunet-service-arm.
+ */
+struct GNUNET_OS_Process *arm_proc;
 
 /**
  * Function scheduled as very last function, cleans up after us
@@ -46,23 +63,39 @@ static struct GNUNET_CORE_Handle *core_handle;
 static void
 cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 {
-  GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
+  die_task = GNUNET_SCHEDULER_NO_TASK;
 
-  if (core_handle != NULL)
+  if (core != NULL)
     {
-      GNUNET_CORE_disconnect (core_handle);
-      core_handle = NULL;
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Disconnecting core.\n");
+      GNUNET_CORE_disconnect (core);
+      core = NULL;
     }
-}
 
-static struct GNUNET_PeerIdentity myself;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Stopping peer\n");
+  if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
 
-struct GNUNET_CORE_Handle *core;
+  if (GNUNET_OS_process_wait(arm_proc) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (arm_proc));
+  GNUNET_OS_process_close (arm_proc);
+  arm_proc = NULL;
+
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
+}
 
 static int
 receive(void* cls, const struct GNUNET_PeerIdentity* other, const struct GNUNET_MessageHeader* message, const struct GNUNET_TRANSPORT_ATS_Information* atsi)
 {
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel(die_task);
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received message from peer %s\n", GNUNET_i2s(other));
+  GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+  ret = 0;
   return GNUNET_OK;
 }
 
@@ -108,6 +141,7 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Connected to myself; sending message!\n");
       GNUNET_CORE_notify_transmit_ready (core,
+                                        GNUNET_YES,
                                         0, GNUNET_TIME_UNIT_FOREVER_REL,
                                         peer,
                                         sizeof (struct GNUNET_MessageHeader),
@@ -127,41 +161,82 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg_)
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   const static struct GNUNET_CORE_MessageHandler handlers[] = {
-    {receive, GNUNET_MESSAGE_TYPE_SERVICE_UDP, 0},
+    {&receive, GNUNET_MESSAGE_TYPE_SERVICE_UDP, 0},
     {NULL, 0, 0}
   };
-  core = GNUNET_CORE_connect (cfg_,
+
+  core_cfg = GNUNET_CONFIGURATION_create ();
+
+  arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+                                        "gnunet-service-arm",
+#if VERBOSE
+                                        "-L", "DEBUG",
+#endif
+                                        "-c", "test_core_api_peer1.conf", NULL);
+
+  GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_load (core_cfg, "test_core_api_peer1.conf"));
+
+  core = GNUNET_CORE_connect (core_cfg,
                              42,
                              NULL,
-                             init,
-                             connect_cb,
+                             &init,
+                             &connect_cb,
                              NULL, NULL, NULL, 0, NULL, 0, handlers);
-  GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
+
+  die_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60), &cleanup, cls);
 }
 
-/**
- * The main function to obtain template from gnunetd.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
+
+static int
+check ()
 {
+  char *const argv[] = { "test-core-api-send-to-self",
+    "-c",
+    "test_core_api_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
 
+  ret = 1;
+
   return (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
+         GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                              argv,
                              "test_core_api_send_to_self",
                              gettext_noop ("help text"),
                              options, &run, NULL)) ? ret : 1;
 }
 
+/**
+ * The main function to obtain template from gnunetd.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *argv[])
+{
+  GNUNET_log_setup ("test-core-api-send-to-self",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
+  return ret;
+}
+
 /* end of test_core_api_send_to_self.c */