From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 12 Sep 2012 10:44:39 +0000 (+0000)
Subject: triple star fun
X-Git-Tag: initial-import-from-subversion-38251~11855
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=408d03be57dd4ddc3d401d9596952e2e4ebcbc41;p=oweals%2Fgnunet.git

triple star fun
---

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index a784ed641..966705bc6 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -114,12 +114,11 @@ GNUNET_TESTBED_host_create_with_id (uint32_t id,
  *
  * @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);
 
 
 /**
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index ca9ec85f4..7bab5121c 100644
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -232,7 +232,7 @@ static char *topology_file;
 /**
  * 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 @@ controller_start_cb (void *cls,
       return;
     }
   num_hosts = GNUNET_TESTBED_hosts_load_from_file (hosts_file,
-						   /* FIXME: & */ hosts);
+						   &hosts);
   if (0 == num_hosts)
     {
       fprintf (stderr,
diff --git a/src/stream/stream_protocol.h b/src/stream/stream_protocol.h
index 04b1ef1ee..ca14d16ed 100644
--- a/src/stream/stream_protocol.h
+++ b/src/stream/stream_protocol.h
@@ -114,18 +114,18 @@ struct GNUNET_STREAM_AckMessage
    */
   struct GNUNET_STREAM_MessageHeader header;
 
-  /**
-   * 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;
 
+  /**
+   * 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;
+
   /**
    * Available buffer space past the last acknowledged buffer (for flow control),
    * in bytes.
@@ -161,6 +161,7 @@ struct GNUNET_STREAM_HelloAckMessage
 
 /**
  * The Transmit close message(used to signal transmission is closed)
+ * FIXME: dead struct?
  */
 struct GNUNET_STREAM_TransmitCloseMessage
 {
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 20e601265..cbbc9fdee 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -293,8 +293,17 @@ GNUNET_TESTBED_host_create (const char *hostname, const char *username,
  */
 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;