summaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-10-10 10:36:47 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-10-10 10:36:47 +0000
commite93cd1377e5a3a5d7e4327eaef0c9e38daa98b3f (patch)
tree51a18f80e83484e3e55cf9bf02cf3e62fc581c27 /src/transport
parent0513a75ca89a15c336fa380dfb69e08aaa621e7c (diff)
naming
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/test_transport_api.c2
-rw-r--r--src/transport/test_transport_api_limited_sockets.c2
-rw-r--r--src/transport/test_transport_api_reliability.c2
-rw-r--r--src/transport/test_transport_api_timeout.c2
-rw-r--r--src/transport/test_transport_api_unreliability_constant.c2
-rw-r--r--src/transport/test_transport_startonly.c2
-rw-r--r--src/transport/test_transport_testing.c2
-rw-r--r--src/transport/transport-testing.c26
-rw-r--r--src/transport/transport-testing.h18
9 files changed, 29 insertions, 29 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index d0159927e..70658d40b 100644
--- 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 7ceed03aa..231934f89 100644
--- 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 0719a9e47..21912e848 100644
--- 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 bb8ede313..89a74e9a9 100644
--- 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 670e34f7a..f5adeb25c 100644
--- 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 730d7946c..68fac8e95 100644
--- 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 066e56d5b..44f050131 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;
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 45ce444f1..76d88ab84 100644
--- 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 94cfaf59a..ed9238ecb 100644
--- 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 ();
/*