-adding some rudimentary logging

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

diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index c67d1b27e8d9fc75bd47f57ae3c01067d60cd157..be8c547cc5d06399040442a63f4203c0ff31449e 100644 (file)
--- a/src/transport/test_transport_testing.c
+++ b/src/transport/test_transport_testing.c
@@ -37,9 +37,9 @@
 #include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
-#define VERBOSE_ARM GNUNET_NO
+#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
 
 #define START_ARM GNUNET_YES
 
@@ -48,67 +48,155 @@
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-static struct PeerContext * p;
+GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+static struct PeerContext *p1;
+static struct PeerContext *p2;
+
+static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
+
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
+static int connected = GNUNET_NO;
+
+static int ret = 0;
+
+static void
+end ()
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
+
+  if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (timeout_task);
+
+  GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+  GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+  GNUNET_TRANSPORT_TESTING_done (tth);
+}
+
+static void
+end_badly ()
+{
+  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+
+  if (p1 != NULL)
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+  if (p2 != NULL)
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+  GNUNET_TRANSPORT_TESTING_done (tth);
+
+  ret = GNUNET_SYSERR;
+}
 
 static void
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                uint32_t ats_count)
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+{
+  char *ps = GNUNET_strdup (GNUNET_i2s (&p1->id));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer %u (`%4s') connected to peer %u (`%s')!\n", p1->no, ps,
+              p2->no, GNUNET_i2s (&p2->id));
+  GNUNET_free (ps);
+  GNUNET_SCHEDULER_add_now (&end, NULL);
+}
+
+static void
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
+                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n",
-       GNUNET_i2s (peer));
+              GNUNET_i2s (peer));
+  connected++;
 }
 
 static void
 notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected \n",
-       GNUNET_i2s (peer));
+              GNUNET_i2s (peer));
 }
 
 static void
-notify_receive (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
+notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                uint32_t ats_count)
+                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving\n");
 }
 
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+void
+start_cb (struct PeerContext *p, void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
-  p = GNUNET_TRANSPORT_TESTING_start_peer("test_quota_compliance_tcp_peer1.conf",
-      &notify_receive,
-      &notify_connect,
-      &notify_disconnect,
-      NULL);
+  static int started;
+
+  started++;
 
-  if (p != NULL)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer was successfully started\n");
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer was not started successfully\n");
-  GNUNET_assert (p != NULL);
-  GNUNET_assert (p->th != NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+              GNUNET_i2s (&p->id));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peer\n");
+  if (started != 2)
+    return;
 
-  GNUNET_TRANSPORT_TESTING_stop_peer(p);
+  char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
+              p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
+  GNUNET_free (sender_c);
+
+  cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+                                               NULL);
 
 }
 
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  tth = GNUNET_TRANSPORT_TESTING_init ();
+
+  timeout_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &end_badly, NULL);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
+  p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+                                            "test_transport_api_tcp_peer1.conf",
+                                            1, &notify_receive, &notify_connect,
+                                            &notify_disconnect, &start_cb, p1);
+
+  GNUNET_assert (p1->hostkeyfile != NULL);
+
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+                                            "test_transport_api_tcp_peer2.conf",
+                                            2, &notify_receive, &notify_connect,
+                                            &notify_disconnect, &start_cb, p2);
+
+  GNUNET_assert (p2->hostkeyfile != NULL);
+
+  if (p1 == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Peer1 was not started successfully\n");
+    if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+      GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  }
+  if (p2 == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Peer2 was not started successfully\n");
+    if (timeout_task != GNUNET_SCHEDULER_NO_TASK)
+      GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  }
+}
+
 int
 main (int argc, char *argv[])
 {
-  int ret = 0;
-
   GNUNET_log_setup ("test_transport_testing",
 #if VERBOSE
                     "DEBUG",
@@ -130,9 +218,8 @@ main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
-  GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1,
-                      argv_1, "test_transport_testing", "nohelp",
-                      options, &run, &ret);
+  GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1, argv_1,
+                      "test_transport_testing", "nohelp", options, &run, &ret);
 
   return ret;
 }