installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating...

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

diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 5779b969dee9d3d11bf1638bdd9ee83fa278c48f..11fd145042c763e29955e1de712a2cc589b39e83 100644 (file)
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -20,9 +20,6 @@
 /**
  * @file core/test_core_api.c
  * @brief testcase for core_api.c
- *
- * FIXME:
- * - make sure connect callback is invoked properly as well!
  */
 #include "platform.h"
 #include "gnunet_common.h"
@@ -34,7 +31,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 
@@ -65,7 +62,7 @@ static GNUNET_SCHEDULER_TaskIdentifier con_task;
 static int ok;
 
 #if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
 #else
 #define OKPP do { ok++; } while (0)
 #endif
@@ -91,11 +88,22 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_assert (ok == 6);
   GNUNET_CORE_disconnect (p1.ch);
+  p1.ch = NULL;
   GNUNET_CORE_disconnect (p2.ch);
+  p2.ch = NULL;
   GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
+  p1.ghh = NULL;
   GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
+  p2.ghh = NULL;
   GNUNET_TRANSPORT_disconnect (p1.th);
+  p1.th = NULL;
   GNUNET_TRANSPORT_disconnect (p2.th);
+  p2.th = NULL;
+  if (GNUNET_SCHEDULER_NO_TASK != con_task)
+  {
+    GNUNET_SCHEDULER_cancel (con_task);
+    con_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   ok = 0;
 }
 
@@ -104,7 +112,7 @@ static void
 terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 #if VERBOSE
-  fprintf (stderr, "ENDING ANGRILY %u\n", ok);
+  FPRINTF (stderr, "ENDING ANGRILY %u\n", ok);
 #endif
   GNUNET_break (0);
   if (NULL != p1.ch)
@@ -129,6 +137,11 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_TRANSPORT_disconnect (p2.th);
     p2.th = NULL;
   }
+  if (GNUNET_SCHEDULER_NO_TASK != con_task)
+  {
+    GNUNET_SCHEDULER_cancel (con_task);
+    con_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   ok = 42;
 }
 
@@ -152,7 +165,8 @@ transmit_ready (void *cls, size_t size, void *buf)
 
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi,
+                unsigned int atsi_count)
 {
   struct PeerContext *pc = cls;
 
@@ -176,7 +190,7 @@ connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
     if (NULL ==
         GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_YES, 0,
                                            GNUNET_TIME_relative_multiply
-                                           (GNUNET_TIME_UNIT_SECONDS, 45),
+                                           (GNUNET_TIME_UNIT_SECONDS, 145),
                                            &p2.id,
                                            sizeof (struct GNUNET_MessageHeader),
                                            &transmit_ready, &p1))
@@ -205,7 +219,8 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 static int
 inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi,
+                unsigned int atsi_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
@@ -216,7 +231,8 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
                  const struct GNUNET_MessageHeader *message,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                 const struct GNUNET_ATS_Information *atsi,
+                 unsigned int atsi_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
@@ -229,7 +245,8 @@ outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
 static int
 process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
-               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+               const struct GNUNET_ATS_Information *atsi,
+               unsigned int atsi_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving message from `%4s'.\n",
               GNUNET_i2s (peer));
@@ -259,15 +276,15 @@ connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &connect_task,
                                     NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking core (1) to connect to peer `%4s'\n",
+              "Asking transport (1) to connect to peer `%4s'\n",
               GNUNET_i2s (&p2.id));
   GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
 }
 
+
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
 
@@ -282,10 +299,9 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server,
     OKPP;
     /* connect p2 */
     p2.ch =
-        GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify,
-                             &disconnect_notify, NULL, &inbound_notify,
-                             GNUNET_YES, &outbound_notify, GNUNET_YES,
-                             handlers);
+        GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify,
+                             &disconnect_notify, &inbound_notify, GNUNET_YES,
+                             &outbound_notify, GNUNET_YES, handlers);
   }
   else
   {
@@ -300,20 +316,23 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server,
 static void
 setup_peer (struct PeerContext *p, const char *cfgname)
 {
+  char *binary;
+
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
 #if START_ARM
   p->arm_proc =
-      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                               "gnunet-service-arm",
-#if VERBOSE
-                               "-L", "DEBUG",
-#endif
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 
+                            NULL, NULL, 
+                            binary,
+                            "gnunet-service-arm",
                                "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
   GNUNET_assert (p->th != NULL);
   p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
+  GNUNET_free (binary);
 }
 
 
@@ -327,14 +346,15 @@ run (void *cls, char *const *args, const char *cfgfile,
   setup_peer (&p2, "test_core_api_peer2.conf");
   err_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 120),
+                                    (GNUNET_TIME_UNIT_SECONDS, 300),
                                     &terminate_task_error, NULL);
   p1.ch =
-      GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,
-                           &disconnect_notify, NULL, &inbound_notify,
-                           GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
+      GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify,
+                           &disconnect_notify, &inbound_notify, GNUNET_YES,
+                           &outbound_notify, GNUNET_YES, handlers);
 }
 
+
 static void
 stop_arm (struct PeerContext *p)
 {
@@ -345,7 +365,7 @@ stop_arm (struct PeerContext *p)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n",
               GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
+  GNUNET_OS_process_destroy (p->arm_proc);
   p->arm_proc = NULL;
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);