From 83b19539f4d322b43683f5838b72e9ec2c8e6073 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 4 Nov 2011 14:00:32 +0000 Subject: curly wars / auto-indentation --- src/transport/test_transport_api_reliability.c | 88 ++++++++++++++------------ 1 file changed, 46 insertions(+), 42 deletions(-) (limited to 'src/transport/test_transport_api_reliability.c') diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index e4b635905..5bbff2550 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -69,9 +69,9 @@ struct PeerContext *p1; struct PeerContext *p2; -struct PeerContext * sender; +struct PeerContext *sender; -struct PeerContext * receiver; +struct PeerContext *receiver; struct GNUNET_TRANSPORT_TransmitHandle *th; @@ -79,7 +79,7 @@ char *cfg_file_p1; char *cfg_file_p2; -struct GNUNET_TRANSPORT_TESTING_handle * tth; +struct GNUNET_TRANSPORT_TESTING_handle *tth; static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; @@ -151,7 +151,7 @@ end () th = NULL; if (cc != NULL) - GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc); + GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2); @@ -175,7 +175,7 @@ end_badly () th = NULL; if (cc != NULL) - GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc); + GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc); if (p1 != NULL) GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1); @@ -201,8 +201,7 @@ get_size (unsigned int iter) 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_ATS_Information *ats, uint32_t ats_count) { static int n; unsigned int s; @@ -253,9 +252,12 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, if (ntohl (hdr->num) % 5000 == 0) { struct PeerContext *p = cls; - char * ps = strdup(GNUNET_i2s(&p->id)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') got message %u of size %u from peer (`%s')\n", - p->no, ps, ntohl (hdr->num), ntohs (message->size), GNUNET_i2s(peer)); + char *ps = strdup (GNUNET_i2s (&p->id)); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer %u (`%s') got message %u of size %u from peer (`%s')\n", + p->no, ps, ntohl (hdr->num), ntohs (message->size), + GNUNET_i2s (peer)); GNUNET_free (ps); } #endif @@ -289,7 +291,8 @@ notify_ready (void *cls, size_t size, void *buf) if (buf == NULL) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Timeout occurred while waiting for transmit_ready for message %u of %u\n", msg_scheduled, TOTAL_MSGS); + "Timeout occurred while waiting for transmit_ready for message %u of %u\n", + msg_scheduled, TOTAL_MSGS); if (GNUNET_SCHEDULER_NO_TASK != die_task) GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); @@ -316,12 +319,12 @@ notify_ready (void *cls, size_t size, void *buf) if (n % 5000 == 0) { - char * receiver_s = strdup(GNUNET_i2s (&receiver->id)); + char *receiver_s = strdup (GNUNET_i2s (&receiver->id)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message of size %u from peer %u (`%4s') -> peer %u (`%s') !\n", - n, - sender->no, - GNUNET_i2s (&sender->id), receiver->no, receiver_s); + n, sender->no, GNUNET_i2s (&sender->id), receiver->no, + receiver_s); GNUNET_free (receiver_s); } #endif @@ -356,11 +359,11 @@ notify_ready (void *cls, size_t size, void *buf) static void notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_ATS_Information *ats, - uint32_t ats_count) + const struct GNUNET_ATS_Information *ats, uint32_t ats_count) { struct PeerContext *p = cls; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') connected to us!\n", p->no, GNUNET_i2s (peer)); } @@ -370,8 +373,9 @@ static void notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { struct PeerContext *p = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') disconnected!\n", - p->no, GNUNET_i2s (peer)); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%4s') disconnected!\n", p->no, + GNUNET_i2s (peer)); if (th != NULL) GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); th = NULL; @@ -391,9 +395,9 @@ static void testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) { char *p1_c = strdup (GNUNET_i2s (&p1->id)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %u (%s) <-> %u (%s)\n", - p1->no, p1_c, - p2->no, GNUNET_i2s (&p2->id)); + p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id)); GNUNET_free (p1_c); cc = NULL; @@ -402,37 +406,39 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) } -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; test_connected = GNUNET_NO; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u: `%s' using configuration file `%s'\n", - p1->no, - GNUNET_i2s (&p1->id), cfg_file_p1); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u: `%s' using configuration file `%s'\n", - p2->no, - GNUNET_i2s (&p2->id), cfg_file_p2); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer %u: `%s' using configuration file `%s'\n", p1->no, + GNUNET_i2s (&p1->id), cfg_file_p1); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer %u: `%s' using configuration file `%s'\n", p2->no, + GNUNET_i2s (&p2->id), cfg_file_p2); sender = p2; receiver = p1; char *sender_c = strdup (GNUNET_i2s (&sender->id)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test triest to send from %u (%s) -> peer %u (%s)\n", - sender->no, sender_c, - receiver->no, GNUNET_i2s (&receiver->id)); - cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Test triest to send from %u (%s) -> peer %u (%s)\n", sender->no, + sender_c, receiver->no, GNUNET_i2s (&receiver->id)); + + cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb, + NULL); } @@ -444,14 +450,12 @@ run (void *cls, char *const *args, const char *cfgfile, die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, - ¬ify_receive, - ¬ify_connect, ¬ify_disconnect, - &start_cb, + ¬ify_receive, ¬ify_connect, + ¬ify_disconnect, &start_cb, NULL); p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, - ¬ify_receive, - ¬ify_connect, ¬ify_disconnect, - &start_cb, + ¬ify_receive, ¬ify_connect, + ¬ify_disconnect, &start_cb, NULL); if ((p1 == NULL) || (p2 == NULL)) -- cgit v1.2.3