From 60920228fd7344ededc9f0711f2b47ddffa02313 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 5 Nov 2012 15:50:23 +0000 Subject: [PATCH] doxygen error --- src/transport/plugin_transport_http_client.c | 27 ++++++++++++++++--- .../test_transport_api_unreliability.c | 13 ++++++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index ad57e368a..a11d13736 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -104,9 +104,20 @@ struct HTTP_Message */ struct Session; +/** + * A connection handle + * + */ struct ConnectionHandle { + /** + * The curl easy handle + */ CURL *easyhandle; + + /** + * The related session + */ struct Session *s; }; @@ -345,6 +356,12 @@ static int client_schedule (struct HTTP_Client_Plugin *plugin, int now); +/** + * Connect a HTTP put connection + * + * @param s the session to connect + * @return GNUNET_SYSERR for hard failure, GNUNET_OK for success + */ static int client_connect_put (struct Session *s); @@ -415,7 +432,6 @@ client_log (CURL *curl, curl_infotype type, break; } -#if VERBOSE_CURL memcpy (text, data, size); if (text[size - 1] == '\n') text[size] = '\0'; @@ -432,7 +448,6 @@ client_log (CURL *curl, curl_infotype type, "Connection %p %s: %s", ch->easyhandle, ttype, text); #endif } -#endif return 0; } @@ -998,7 +1013,7 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); /** * Function setting up file descriptors and scheduling task to run * - * @param plugin plugin as closure + * @param plugin the plugin as closure * @param now schedule task in 1ms, regardless of what curl may say * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok */ @@ -1240,6 +1255,12 @@ client_connect_get (struct Session *s) return GNUNET_OK; } +/** + * Connect a HTTP put connection + * + * @param s the session to connect + * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok + */ static int client_connect_put (struct Session *s) { diff --git a/src/transport/test_transport_api_unreliability.c b/src/transport/test_transport_api_unreliability.c index e3ca4be1c..f1e249cdb 100644 --- a/src/transport/test_transport_api_unreliability.c +++ b/src/transport/test_transport_api_unreliability.c @@ -71,6 +71,8 @@ struct GNUNET_TRANSPORT_TESTING_handle *tth; */ /** + * Total number of messages to send + * * Note that this value must not significantly exceed * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise * messages may be dropped even for a reliable transport. @@ -161,7 +163,7 @@ end () { if (get_bit (bitmap, i) == 0) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Did not receive message %d\n", i); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not receive message %d\n", i); ok = -1; } } @@ -260,7 +262,7 @@ set_bit (unsigned int bitIdx) static int get_bit (const char *map, unsigned int bit) { - if (bit >= TOTAL_MSGS) + if (bit > TOTAL_MSGS) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "get bit %d of %d(!?!?)\n", bit, sizeof (bitmap) * 8); @@ -369,10 +371,11 @@ notify_ready (void *cls, size_t size, void *buf) s = get_size (n); GNUNET_assert (size >= s); GNUNET_assert (buf != NULL); - GNUNET_assert (n <= TOTAL_MSGS); + GNUNET_assert (n < TOTAL_MSGS); cbuf = buf; do { + GNUNET_assert (n < TOTAL_MSGS); hdr.header.size = htons (s); hdr.header.type = htons (MTYPE); hdr.num = htonl (n); @@ -394,7 +397,7 @@ notify_ready (void *cls, size_t size, void *buf) if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16)) break; /* sometimes pack buffer full, sometimes not */ } - while (size - ret >= s); + while ((size - ret >= s) && (n < TOTAL_MSGS)); if (n < TOTAL_MSGS) { th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0, @@ -444,6 +447,8 @@ static void sendtask () { start_time = GNUNET_TIME_absolute_get (); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Starting to send %u messages\n", + TOTAL_MSGS); th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0), 0, TIMEOUT_TRANSMIT, ¬ify_ready, NULL); -- 2.25.1