-doxygen

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

diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
index f8f6040a90da6359c5f95e063471b2fc8c753a98..7186d1b3f35be90e6fa7e35bb3ebbea01644ee89 100644 (file)
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -25,22 +25,9 @@
  *
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
-#include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_NO
-
-#define START_ARM GNUNET_YES
-
-
 struct PeerContext *p1;
 
 struct PeerContext *p2;
@@ -61,9 +48,9 @@ struct GNUNET_TRANSPORT_TESTING_handle *tth;
  */
 #define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
-#define MSIZE 2600
+#define TEST_MESSAGE_SIZE 2600
 
-#define MTYPE 12345
+#define TEST_MESSAGE_TYPE 12345
 
 
 static int ok;
@@ -192,8 +179,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+                const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *p = cls;
   struct PeerContext *t = NULL;
@@ -212,8 +198,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
               GNUNET_i2s (&t->id));
   GNUNET_free (ps);
 
-  if ((MTYPE == ntohs (message->type)) &&
-      (MSIZE == ntohs (message->size)))
+  if ((TEST_MESSAGE_TYPE == ntohs (message->type)) &&
+      (TEST_MESSAGE_SIZE == ntohs (message->size)))
   {
     ok = 0;
     shutdown_task = GNUNET_SCHEDULER_add_now(&end, NULL);
@@ -249,13 +235,13 @@ notify_ready (void *cls, size_t size, void *buf)
     return 0;
   }
 
-  GNUNET_assert (size >= MSIZE);
+  GNUNET_assert (size >= TEST_MESSAGE_SIZE);
 
   if (buf != NULL)
   {
     hdr = buf;
-    hdr->size = htons (MSIZE);
-    hdr->type = htons (MTYPE);
+    hdr->size = htons (TEST_MESSAGE_SIZE);
+    hdr->type = htons (TEST_MESSAGE_TYPE);
   }
 
   char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
@@ -265,7 +251,7 @@ notify_ready (void *cls, size_t size, void *buf)
               GNUNET_i2s (&p->id));
   GNUNET_free (ps);
 
-  return MSIZE;
+  return TEST_MESSAGE_SIZE;
 }
 
 static void
@@ -282,14 +268,13 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
               p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
   GNUNET_free (receiver_s);
 
-  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, MSIZE, 0,
+  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE, 0,
                                                TIMEOUT_TRANSMIT, &notify_ready,
                                                p1);
 }
 
 static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   static int c;
 
@@ -435,19 +420,12 @@ check ()
   static char *const argv[] = { "test-transport-api-blacklisting",
     "-c",
     "test_transport_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
 
-#if WRITECONFIG
-  setTransportOptions ("test_transport_api_data.conf");
-#endif
-
   ok = 1;
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-transport-api-blacklisting",
                       "nohelp", options, &run, &ok);
@@ -461,11 +439,7 @@ main (int argc, char *argv[])
   int ret;
 
   GNUNET_log_setup ("test-transport-api-blacklisting",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
 
   tth = GNUNET_TRANSPORT_TESTING_init ();