X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_testing.c;h=be8c547cc5d06399040442a63f4203c0ff31449e;hb=6d754e6c89fda8cb0da00c4152ffc6dcc707e6ce;hp=066e56d5bb1f90493793a6f291f988b23b2ab798;hpb=0663a057d7611270d5f41ae8b345125d737387f2;p=oweals%2Fgnunet.git

diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index 066e56d5b..be8c547cc 100644
--- a/src/transport/test_transport_testing.c
+++ b/src/transport/test_transport_testing.c
@@ -55,7 +55,7 @@ static struct PeerContext *p2;
 
 static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
 
 static int connected = GNUNET_NO;
 
@@ -94,9 +94,10 @@ end_badly ()
 static void
 testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
 {
-  char * ps = strdup (GNUNET_i2s(&p1->id));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') connected to peer %u (`%s')!\n",
-              p1->no, ps,
+  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);
@@ -104,8 +105,7 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
 
 static void
 notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                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, "Peer `%s' connected \n",
               GNUNET_i2s (peer));
@@ -122,29 +122,30 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 static void
 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");
 }
 
-void start_cb (struct PeerContext * p,
-               void *cls)
+void
+start_cb (struct PeerContext *p, void *cls)
 {
   static int started;
+
   started++;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n",
-       p->no,
-       GNUNET_i2s (&p->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+              GNUNET_i2s (&p->id));
 
   if (started != 2)
     return;
 
-  char *sender_c = 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));
+  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);
@@ -161,34 +162,35 @@ run (void *cls, char *const *args, const char *cfgfile,
       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);
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_api_tcp_peer2.conf",
-                                            2,
-                                            &notify_receive, &notify_connect,
-                                            &notify_disconnect,
-                                            &start_cb,
-                                            p2);
+  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");
+    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);
+      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");
+    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);
+      GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
   }
 }