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 48dd0ee73db746d1a80bb0ef49e197661cb705f6..b287ecf05c9b19d7320e4b2bd2e1c254e2fedcf1 100644 (file)
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -42,6 +42,11 @@ 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
  */
@@ -136,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),
@@ -163,14 +169,18 @@ run (void *cls,
     {NULL, 0, 0}
   };
 
+  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_data.conf", NULL);
+                                        "-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 (cfg,
+  core = GNUNET_CORE_connect (core_cfg,
                              42,
                              NULL,
                              &init,
@@ -180,26 +190,53 @@ run (void *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 */