[GNUnet-SVN] r24753 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-11-05 16:50:23 +0100 (Mon, 05 Nov 2012)
New Revision: 24753

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/test_transport_api_unreliability.c
Log:
doxygen error

Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-11-05 15:22:17 UTC 
(rev 24752)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-11-05 15:50:23 UTC 
(rev 24753)
@@ -104,9 +104,20 @@
  */
 struct Session;
 
+/**
+ * A connection handle
+ * 
+ */
 struct ConnectionHandle
 {
+  /**
+   * The curl easy handle 
+   */
   CURL *easyhandle;
+  
+  /**
+   * The related session 
+   */
   struct Session *s;
 };
 
@@ -345,6 +356,12 @@
 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 @@
         break;
     }
 
-#if VERBOSE_CURL
     memcpy (text, data, size);
     if (text[size - 1] == '\n')
       text[size] = '\0';
@@ -432,7 +448,6 @@
                      "Connection %p %s: %s", ch->easyhandle, ttype, text);
 #endif
   }
-#endif
   return 0;
 }
 
@@ -998,7 +1013,7 @@
 /**
  * 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 @@
   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)
 {

Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c     2012-11-05 
15:22:17 UTC (rev 24752)
+++ gnunet/src/transport/test_transport_api_unreliability.c     2012-11-05 
15:50:23 UTC (rev 24753)
@@ -71,6 +71,8 @@
  */
 
 /**
+ * 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 @@
   {
     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 @@
 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 @@
   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 @@
     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 @@
 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, &notify_ready,
                                                NULL);