diff options
-rw-r--r-- | src/include/gnunet_testbed_service.h | 3 | ||||
-rw-r--r-- | src/nse/gnunet-nse-profiler.c | 4 | ||||
-rw-r--r-- | src/stream/stream_protocol.h | 13 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 11 |
4 files changed, 20 insertions, 11 deletions
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, | |||
114 | * | 114 | * |
115 | * @param filename file with the host specification | 115 | * @param filename file with the host specification |
116 | * @param hosts set to the hosts found in the file | 116 | * @param hosts set to the hosts found in the file |
117 | * FIXME: we need "***" here! | ||
118 | * @return number of hosts returned in 'hosts', 0 on error | 117 | * @return number of hosts returned in 'hosts', 0 on error |
119 | */ | 118 | */ |
120 | unsigned int | 119 | unsigned int |
121 | GNUNET_TESTBED_hosts_load_from_file (const char *filename, | 120 | GNUNET_TESTBED_hosts_load_from_file (const char *filename, |
122 | struct GNUNET_TESTBED_Host **hosts); | 121 | struct GNUNET_TESTBED_Host ***hosts); |
123 | 122 | ||
124 | 123 | ||
125 | /** | 124 | /** |
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; | |||
232 | /** | 232 | /** |
233 | * List of hosts we use for the testbed. | 233 | * List of hosts we use for the testbed. |
234 | */ | 234 | */ |
235 | static struct GNUNET_TESTBED_Host **hosts; | 235 | static struct GNUNET_TESTBED_Host *hosts; |
236 | 236 | ||
237 | /** | 237 | /** |
238 | * Size of the 'hosts' array. | 238 | * Size of the 'hosts' array. |
@@ -893,7 +893,7 @@ controller_start_cb (void *cls, | |||
893 | return; | 893 | return; |
894 | } | 894 | } |
895 | num_hosts = GNUNET_TESTBED_hosts_load_from_file (hosts_file, | 895 | num_hosts = GNUNET_TESTBED_hosts_load_from_file (hosts_file, |
896 | /* FIXME: & */ hosts); | 896 | &hosts); |
897 | if (0 == num_hosts) | 897 | if (0 == num_hosts) |
898 | { | 898 | { |
899 | fprintf (stderr, | 899 | 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 | |||
@@ -115,18 +115,18 @@ struct GNUNET_STREAM_AckMessage | |||
115 | struct GNUNET_STREAM_MessageHeader header; | 115 | struct GNUNET_STREAM_MessageHeader header; |
116 | 116 | ||
117 | /** | 117 | /** |
118 | * The Selective Acknowledgement Bitmap. Computed relative to the base_seq | ||
119 | * (bit n corresponds to the Data message with sequence number base_seq+n) | ||
120 | */ | ||
121 | GNUNET_STREAM_AckBitmap bitmap GNUNET_PACKED; | ||
122 | |||
123 | /** | ||
124 | * The sequence number of the next Data Message receiver is | 118 | * The sequence number of the next Data Message receiver is |
125 | * anticipating. Data messages less than this number are received by receiver | 119 | * anticipating. Data messages less than this number are received by receiver |
126 | */ | 120 | */ |
127 | uint32_t base_sequence_number GNUNET_PACKED; | 121 | uint32_t base_sequence_number GNUNET_PACKED; |
128 | 122 | ||
129 | /** | 123 | /** |
124 | * The Selective Acknowledgement Bitmap. Computed relative to the base_seq | ||
125 | * (bit n corresponds to the Data message with sequence number base_seq+n) | ||
126 | */ | ||
127 | GNUNET_STREAM_AckBitmap bitmap GNUNET_PACKED; | ||
128 | |||
129 | /** | ||
130 | * Available buffer space past the last acknowledged buffer (for flow control), | 130 | * Available buffer space past the last acknowledged buffer (for flow control), |
131 | * in bytes. | 131 | * in bytes. |
132 | */ | 132 | */ |
@@ -161,6 +161,7 @@ struct GNUNET_STREAM_HelloAckMessage | |||
161 | 161 | ||
162 | /** | 162 | /** |
163 | * The Transmit close message(used to signal transmission is closed) | 163 | * The Transmit close message(used to signal transmission is closed) |
164 | * FIXME: dead struct? | ||
164 | */ | 165 | */ |
165 | struct GNUNET_STREAM_TransmitCloseMessage | 166 | struct GNUNET_STREAM_TransmitCloseMessage |
166 | { | 167 | { |
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, | |||
293 | */ | 293 | */ |
294 | unsigned int | 294 | unsigned int |
295 | GNUNET_TESTBED_hosts_load_from_file (const char *filename, | 295 | GNUNET_TESTBED_hosts_load_from_file (const char *filename, |
296 | struct GNUNET_TESTBED_Host **hosts) | 296 | struct GNUNET_TESTBED_Host ***hosts) |
297 | { | 297 | { |
298 | #if 0 | ||
299 | struct GNUNET_TESTBED_Host **host_array; | ||
300 | |||
301 | host_array = GNUNET_malloc (num_hosts * sizeof (struct GNUNET_TESTBED_Host *)); | ||
302 | host_array[foo] = GNUNET_TESTBED_host_create (...); | ||
303 | *hosts = host_array; | ||
304 | |||
305 | return num_hosts; | ||
306 | #endif | ||
298 | // see testing_group.c, GNUNET_TESTING_hosts_load | 307 | // see testing_group.c, GNUNET_TESTING_hosts_load |
299 | GNUNET_break (0); | 308 | GNUNET_break (0); |
300 | return 0; | 309 | return 0; |