projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0513a75)
naming
authorMatthias Wachs <wachs@net.in.tum.de>
Mon, 10 Oct 2011 10:36:47 +0000 (10:36 +0000)
committerMatthias Wachs <wachs@net.in.tum.de>
Mon, 10 Oct 2011 10:36:47 +0000 (10:36 +0000)
src/transport/test_transport_api.c patch | blob | history
src/transport/test_transport_api_limited_sockets.c patch | blob | history
src/transport/test_transport_api_reliability.c patch | blob | history
src/transport/test_transport_api_timeout.c patch | blob | history
src/transport/test_transport_api_unreliability_constant.c patch | blob | history
src/transport/test_transport_startonly.c patch | blob | history
src/transport/test_transport_testing.c patch | blob | history
src/transport/transport-testing.c patch | blob | history
src/transport/transport-testing.h patch | blob | history

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index d0159927eef8bf65221340dc7fea8abf724ae600..70658d40b473e1e8cc29f1c6fb5cf9df93753e54 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -74,7 +74,7 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 
 struct GNUNET_TRANSPORT_TransmitHandle *th;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 char *cfg_file_p1;
 
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index 7ceed03aa92c0979ba919930213a131b58fc461d..231934f8977ba5edd5ecc341e1d71dc2e662dd29 100644 (file)
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -77,7 +77,7 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 
 struct GNUNET_TRANSPORT_TransmitHandle *th;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 char *cfg_file_p1;
 
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 0719a9e47b19b54ed8216953e3d2e7f7e7062a68..21912e848e149fcd4738028cdc8dd1f3c70b0788 100644 (file)
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -79,7 +79,7 @@ char *cfg_file_p1;
 
 char *cfg_file_p2;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 /*
  * Testcase specific declarations
diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c
index bb8ede313e61a943b304782c0c415181a4378ec2..89a74e9a99a72a58999d08be7e60af2492221388 100644 (file)
--- a/src/transport/test_transport_api_timeout.c
+++ b/src/transport/test_transport_api_timeout.c
@@ -65,7 +65,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 static GNUNET_SCHEDULER_TaskIdentifier timer_task;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 struct PeerContext *p1;
 
diff --git a/src/transport/test_transport_api_unreliability_constant.c b/src/transport/test_transport_api_unreliability_constant.c
index 670e34f7aadf8c31dada3440d6c53dc0eacca0ef..f5adeb25c6fe2b3d1a0fe890f5d3bb293c9520ac 100644 (file)
--- a/src/transport/test_transport_api_unreliability_constant.c
+++ b/src/transport/test_transport_api_unreliability_constant.c
@@ -71,7 +71,7 @@ struct PeerContext *p2;
 
 struct GNUNET_TRANSPORT_TransmitHandle *th;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 char *cfg_file_p1;
 
diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c
index 730d7946cdc4f9b92fd43c416358f264723f6859..68fac8e957b03d2af0d8fbb5d4528ce6a28265de 100644 (file)
--- a/src/transport/test_transport_startonly.c
+++ b/src/transport/test_transport_startonly.c
@@ -54,7 +54,7 @@ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
 
 static struct PeerContext *p1;
 
-struct TransportTestingHandle * tth;
+struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 static int connected = GNUNET_NO;
 
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c
index 066e56d5bb1f90493793a6f291f988b23b2ab798..44f05013137269d170f70edb93e8733f094ca9ab 100644 (file)
--- 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;
 
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 45ce444f13ccbf1c0f44646e49bbd6b679542ee5..76d88ab848bbc3de45e30e6550c5dd554ccaaab5 100644 (file)
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -27,10 +27,10 @@
 
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#define VERBOSE GNUNET_YES
 
 struct PeerContext *
-find_peer_context_by_pc ( struct TransportTestingHandle *tth,
+find_peer_context_by_pc ( struct GNUNET_TRANSPORT_TESTING_handle *tth,
                           struct PeerContext *p)
 {
   GNUNET_assert (tth != NULL);
@@ -48,7 +48,7 @@ find_peer_context_by_pc ( struct TransportTestingHandle *tth,
 
 
 struct PeerContext *
-find_peer_context ( struct TransportTestingHandle *tth,
+find_peer_context ( struct GNUNET_TRANSPORT_TESTING_handle *tth,
                     const struct GNUNET_PeerIdentity *peer)
 {
   GNUNET_assert (tth != NULL);
@@ -65,7 +65,7 @@ find_peer_context ( struct TransportTestingHandle *tth,
 }
 
 struct ConnectingContext *
-find_connecting_context ( struct TransportTestingHandle *tth,
+find_connecting_context ( struct GNUNET_TRANSPORT_TESTING_handle *tth,
                           struct PeerContext *p1,
                           struct PeerContext * p2)
 {
@@ -243,7 +243,7 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @return the peer context
  */
 struct PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
                                      const char *cfgname,
                                      int peer_id,
                                      GNUNET_TRANSPORT_ReceiveCallback rec,
@@ -309,7 +309,7 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
  * @param p the peer
  */
 void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
                                     struct PeerContext *p)
 {
   GNUNET_assert (p != NULL);
@@ -359,7 +359,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
  * @return connect context
  */
 GNUNET_TRANSPORT_TESTING_ConnectRequest
-GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle * tth,
                                         struct PeerContext *p1,
                                         struct PeerContext *p2,
                                         GNUNET_TRANSPORT_TESTING_connect_cb cb,
@@ -389,8 +389,8 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
   GNUNET_CONTAINER_DLL_insert (tth->cc_head, tth->cc_tail, cc);
 
   cc->tct = GNUNET_SCHEDULER_add_now (&try_connect, cc);
-  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
-      "connect request %X!\n", cc);
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+      "New connect request %X\n", cc);
 
   return cc;
 }
@@ -401,7 +401,7 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
  * @param cc a connect request handle
  */
 void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
-    (struct TransportTestingHandle * tth,
+    (struct GNUNET_TRANSPORT_TESTING_handle * tth,
         GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
 {
   struct ConnectingContext *cc = ccr;
@@ -425,7 +425,7 @@ void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
  * @param tth transport testing handle
  */
 void
-GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth)
+GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle * tth)
 {
   struct ConnectingContext *cc = tth->cc_head;
   struct ConnectingContext *ct = NULL;
@@ -460,10 +460,10 @@ GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth)
  * Initialize the transport testing
  * @return transport testing handle
  */
-struct TransportTestingHandle *
+struct GNUNET_TRANSPORT_TESTING_handle *
 GNUNET_TRANSPORT_TESTING_init ()
 {
-  struct TransportTestingHandle * tth = GNUNET_malloc (sizeof (struct TransportTestingHandle));
+  struct GNUNET_TRANSPORT_TESTING_handle * tth = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TESTING_handle));
 
   return tth;
 }
diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 94cfaf59a81e5347b230b865e8f43e5816c9adc2..ed9238ecbd6effcdb53666c176d6b339cd9353be 100644 (file)
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -58,7 +58,7 @@ typedef void (*GNUNET_TRANSPORT_TESTING_connect_cb) (struct PeerContext * p1,
                                                      void *cls);
 
 
-struct TransportTestingHandle;
+struct GNUNET_TRANSPORT_TESTING_handle;
 
 /**
  * Context for a single peer
@@ -68,7 +68,7 @@ struct PeerContext
   struct PeerContext * next;
   struct PeerContext * prev;
 
-  struct TransportTestingHandle * tth;
+  struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
   struct GNUNET_CONFIGURATION_Handle *cfg;
 
@@ -113,7 +113,7 @@ struct ConnectingContext
   int p2_c;
 };
 
-struct TransportTestingHandle
+struct GNUNET_TRANSPORT_TESTING_handle
 {
   struct ConnectingContext * cc_head;
   struct ConnectingContext * cc_tail;
@@ -134,7 +134,7 @@ struct TransportTestingHandle
  * @return the peer context
  */
 struct PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
                                      const char *cfgname,
                                      int peer_id,
                                      GNUNET_TRANSPORT_ReceiveCallback rec,
@@ -150,7 +150,7 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
  */
 
 void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle * tth,
                                     struct PeerContext *pc);
 
 
@@ -165,7 +165,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
  * @return a connect request handle
  */
 GNUNET_TRANSPORT_TESTING_ConnectRequest
-GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle * tth,
                                         struct PeerContext *p1,
                                         struct PeerContext *p2,
                                         GNUNET_TRANSPORT_TESTING_connect_cb cb,
@@ -177,7 +177,7 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
  * @param cc a connect request handle
  */
 void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct TransportTestingHandle *,
+GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct GNUNET_TRANSPORT_TESTING_handle *,
                                                void *cc);
 
 /**
@@ -185,13 +185,13 @@ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct TransportTestingHandle *,
  * @param tth transport testing handle
  */
 void
-GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth);
+GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle * tth);
 
 /**
  * Initialize the transport testing
  * @return transport testing handle
  */
-struct TransportTestingHandle *
+struct GNUNET_TRANSPORT_TESTING_handle *
 GNUNET_TRANSPORT_TESTING_init ();
 
 /*
Unnamed repository; edit this file 'description' to name the repository.