-makefile for new test_stream_local (commented)

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

diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c
index 075c1052730e33f370bc14f6e99ffeb78f94a28a..79578ab53b65efb5b65ea2a8040c19e9db6014a2 100644 (file)
--- a/src/transport/test_transport_startonly.c
+++ b/src/transport/test_transport_startonly.c
@@ -54,6 +54,8 @@ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
 
 static struct PeerContext *p1;
 
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
 static int connected = GNUNET_NO;
 
 static int ret = 0;
@@ -83,15 +85,14 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
 
   if (p1 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
 
   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)
+                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n",
               GNUNET_i2s (peer));
@@ -108,8 +109,7 @@ 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");
 }
@@ -119,16 +119,20 @@ 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 (TIMEOUT, &end_badly, NULL);
 
   i = 1;
-  fprintf (stderr, "%i", i);
+  FPRINTF (stderr, "%i", i);
   while (i <= ITERATIONS)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
-    p1 = GNUNET_TRANSPORT_TESTING_start_peer ("test_transport_startonly.conf",
-                                              &notify_receive, &notify_connect,
-                                              &notify_disconnect, p1);
+    p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+                                              "test_transport_startonly.conf",
+                                              1, &notify_receive,
+                                              &notify_connect,
+                                              &notify_disconnect, NULL, p1);
 
 
     if (p1 != NULL)
@@ -139,15 +143,16 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_assert (p1 != NULL);
     GNUNET_assert (p1->th != NULL);
 
-    //sleep (5);
-
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
 
     i++;
     if (i <= ITERATIONS)
-      fprintf (stderr, "..%i", i);
+      FPRINTF (stderr, "..%i", i);
   }
-  fprintf (stderr, "\n");
+
+  tth = GNUNET_TRANSPORT_TESTING_init ();
+
+  FPRINTF (stderr, "%s",  "\n");
   end ();
 }