[GNUnet-SVN] r23756 - in gnunet/src: include nse stream testbed

[gnunet]

Author: grothoff
Date: 2012-09-12 12:44:39 +0200 (Wed, 12 Sep 2012)
New Revision: 23756

Modified:
   gnunet/src/include/gnunet_testbed_service.h
   gnunet/src/nse/gnunet-nse-profiler.c
   gnunet/src/stream/stream_protocol.h
   gnunet/src/testbed/testbed_api_hosts.c
Log:
triple star fun

Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2012-09-12 10:37:02 UTC (rev 
23755)
+++ gnunet/src/include/gnunet_testbed_service.h 2012-09-12 10:44:39 UTC (rev 
23756)
@@ -114,12 +114,11 @@
  *
  * @param filename file with the host specification
  * @param hosts set to the hosts found in the file
- *        FIXME: we need "***" here!
  * @return number of hosts returned in 'hosts', 0 on error
  */
 unsigned int
 GNUNET_TESTBED_hosts_load_from_file (const char *filename,
-                                    struct GNUNET_TESTBED_Host **hosts);
+                                    struct GNUNET_TESTBED_Host ***hosts);
 
 
 /**

Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c        2012-09-12 10:37:02 UTC (rev 
23755)
+++ gnunet/src/nse/gnunet-nse-profiler.c        2012-09-12 10:44:39 UTC (rev 
23756)
@@ -232,7 +232,7 @@
 /**
  * List of hosts we use for the testbed.
  */
-static struct GNUNET_TESTBED_Host **hosts;
+static struct GNUNET_TESTBED_Host *hosts;
 
 /**
  * Size of the 'hosts' array.
@@ -893,7 +893,7 @@
       return;
     }
   num_hosts = GNUNET_TESTBED_hosts_load_from_file (hosts_file,
-                                                  /* FIXME: & */ hosts);
+                                                  &hosts);
   if (0 == num_hosts)
     {
       fprintf (stderr,

Modified: gnunet/src/stream/stream_protocol.h
===================================================================
--- gnunet/src/stream/stream_protocol.h 2012-09-12 10:37:02 UTC (rev 23755)
+++ gnunet/src/stream/stream_protocol.h 2012-09-12 10:44:39 UTC (rev 23756)
@@ -115,18 +115,18 @@
   struct GNUNET_STREAM_MessageHeader header;
 
   /**
+   * The sequence number of the next Data Message receiver is
+   * anticipating. Data messages less than this number are received by receiver
+   */
+  uint32_t base_sequence_number GNUNET_PACKED;
+
+  /**
    * The Selective Acknowledgement Bitmap. Computed relative to the base_seq
    * (bit n corresponds to the Data message with sequence number base_seq+n)
    */
   GNUNET_STREAM_AckBitmap bitmap GNUNET_PACKED;
 
   /**
-   * The sequence number of the next Data Message receiver is
-   * anticipating. Data messages less than this number are received by receiver
-   */
-  uint32_t base_sequence_number GNUNET_PACKED;
-
-  /**
    * Available buffer space past the last acknowledged buffer (for flow 
control),
    * in bytes.
    */
@@ -161,6 +161,7 @@
 
 /**
  * The Transmit close message(used to signal transmission is closed)
+ * FIXME: dead struct?
  */
 struct GNUNET_STREAM_TransmitCloseMessage
 {

Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2012-09-12 10:37:02 UTC (rev 
23755)
+++ gnunet/src/testbed/testbed_api_hosts.c      2012-09-12 10:44:39 UTC (rev 
23756)
@@ -293,8 +293,17 @@
  */
 unsigned int
 GNUNET_TESTBED_hosts_load_from_file (const char *filename,
-                                     struct GNUNET_TESTBED_Host **hosts)
+                                     struct GNUNET_TESTBED_Host ***hosts)
 {
+#if 0
+  struct GNUNET_TESTBED_Host **host_array;
+
+  host_array = GNUNET_malloc (num_hosts * sizeof (struct GNUNET_TESTBED_Host 
*));
+  host_array[foo] = GNUNET_TESTBED_host_create (...);
+  *hosts = host_array;
+
+  return num_hosts;
+#endif  
   // see testing_group.c, GNUNET_TESTING_hosts_load
   GNUNET_break (0);
   return 0;