diff options
Diffstat (limited to 'src/testbed/testbed.h')
-rw-r--r-- | src/testbed/testbed.h | 134 |
1 files changed, 32 insertions, 102 deletions
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index b659a3408..8ab957b88 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h | |||
@@ -11,7 +11,7 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
@@ -33,9 +33,7 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
33 | /** | 33 | /** |
34 | * Initial message from a client to a testing control service. | 34 | * Initial message from a client to a testing control service. |
35 | */ | 35 | */ |
36 | struct GNUNET_TESTBED_InitMessage | 36 | struct GNUNET_TESTBED_InitMessage { |
37 | { | ||
38 | |||
39 | /** | 37 | /** |
40 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_INIT | 38 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_INIT |
41 | */ | 39 | */ |
@@ -62,9 +60,7 @@ struct GNUNET_TESTBED_InitMessage | |||
62 | /** | 60 | /** |
63 | * Notify the service about a host that we intend to use. | 61 | * Notify the service about a host that we intend to use. |
64 | */ | 62 | */ |
65 | struct GNUNET_TESTBED_AddHostMessage | 63 | struct GNUNET_TESTBED_AddHostMessage { |
66 | { | ||
67 | |||
68 | /** | 64 | /** |
69 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST | 65 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST |
70 | */ | 66 | */ |
@@ -105,7 +101,6 @@ struct GNUNET_TESTBED_AddHostMessage | |||
105 | /* followed by gzip compressed configuration to start or connect to a | 101 | /* followed by gzip compressed configuration to start or connect to a |
106 | controller on this host. While starting the controller this configuration | 102 | controller on this host. While starting the controller this configuration |
107 | is used as a template */ | 103 | is used as a template */ |
108 | |||
109 | }; | 104 | }; |
110 | 105 | ||
111 | 106 | ||
@@ -114,9 +109,7 @@ struct GNUNET_TESTBED_AddHostMessage | |||
114 | * worked (or failed). | 109 | * worked (or failed). |
115 | * FIXME: Where is this required? | 110 | * FIXME: Where is this required? |
116 | */ | 111 | */ |
117 | struct GNUNET_TESTBED_HostConfirmedMessage | 112 | struct GNUNET_TESTBED_HostConfirmedMessage { |
118 | { | ||
119 | |||
120 | /** | 113 | /** |
121 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS | 114 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS |
122 | */ | 115 | */ |
@@ -129,7 +122,6 @@ struct GNUNET_TESTBED_HostConfirmedMessage | |||
129 | 122 | ||
130 | /* followed by the 0-terminated error message (on failure) | 123 | /* followed by the 0-terminated error message (on failure) |
131 | * (typical errors include host-id already in use) */ | 124 | * (typical errors include host-id already in use) */ |
132 | |||
133 | }; | 125 | }; |
134 | 126 | ||
135 | 127 | ||
@@ -138,9 +130,7 @@ struct GNUNET_TESTBED_HostConfirmedMessage | |||
138 | * requests for a particular client to a particular | 130 | * requests for a particular client to a particular |
139 | * sub-controller. | 131 | * sub-controller. |
140 | */ | 132 | */ |
141 | struct GNUNET_TESTBED_ControllerLinkRequest | 133 | struct GNUNET_TESTBED_ControllerLinkRequest { |
142 | { | ||
143 | |||
144 | /** | 134 | /** |
145 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS | 135 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS |
146 | */ | 136 | */ |
@@ -166,16 +156,13 @@ struct GNUNET_TESTBED_ControllerLinkRequest | |||
166 | * the slave host (and thus responsible for starting it?). 0 if not | 156 | * the slave host (and thus responsible for starting it?). 0 if not |
167 | */ | 157 | */ |
168 | uint8_t is_subordinate; | 158 | uint8_t is_subordinate; |
169 | |||
170 | }; | 159 | }; |
171 | 160 | ||
172 | 161 | ||
173 | /** | 162 | /** |
174 | * Response message for ControllerLinkRequest message | 163 | * Response message for ControllerLinkRequest message |
175 | */ | 164 | */ |
176 | struct GNUNET_TESTBED_ControllerLinkResponse | 165 | struct GNUNET_TESTBED_ControllerLinkResponse { |
177 | { | ||
178 | |||
179 | /** | 166 | /** |
180 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT | 167 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT |
181 | */ | 168 | */ |
@@ -202,7 +189,6 @@ struct GNUNET_TESTBED_ControllerLinkResponse | |||
202 | * running at the delegate host */ | 189 | * running at the delegate host */ |
203 | 190 | ||
204 | /* In case of failure, here comes the error message (without \0 termination)*/ | 191 | /* In case of failure, here comes the error message (without \0 termination)*/ |
205 | |||
206 | }; | 192 | }; |
207 | 193 | ||
208 | 194 | ||
@@ -210,9 +196,7 @@ struct GNUNET_TESTBED_ControllerLinkResponse | |||
210 | * Message sent from client to testing service to | 196 | * Message sent from client to testing service to |
211 | * create (configure, but not start) a peer. | 197 | * create (configure, but not start) a peer. |
212 | */ | 198 | */ |
213 | struct GNUNET_TESTBED_PeerCreateMessage | 199 | struct GNUNET_TESTBED_PeerCreateMessage { |
214 | { | ||
215 | |||
216 | /** | 200 | /** |
217 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER | 201 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER |
218 | */ | 202 | */ |
@@ -239,8 +223,7 @@ struct GNUNET_TESTBED_PeerCreateMessage | |||
239 | uint16_t config_size GNUNET_PACKED; | 223 | uint16_t config_size GNUNET_PACKED; |
240 | 224 | ||
241 | /* followed by serialized peer configuration; | 225 | /* followed by serialized peer configuration; |
242 | * gzip'ed configuration file in INI format */ | 226 | * gzip'ed configuration file in INI format */ |
243 | |||
244 | }; | 227 | }; |
245 | 228 | ||
246 | 229 | ||
@@ -248,9 +231,7 @@ struct GNUNET_TESTBED_PeerCreateMessage | |||
248 | * Message sent from client to testing service to | 231 | * Message sent from client to testing service to |
249 | * reconfigure a (stopped) a peer. | 232 | * reconfigure a (stopped) a peer. |
250 | */ | 233 | */ |
251 | struct GNUNET_TESTBED_PeerReconfigureMessage | 234 | struct GNUNET_TESTBED_PeerReconfigureMessage { |
252 | { | ||
253 | |||
254 | /** | 235 | /** |
255 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER | 236 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER |
256 | */ | 237 | */ |
@@ -272,8 +253,7 @@ struct GNUNET_TESTBED_PeerReconfigureMessage | |||
272 | uint16_t config_size GNUNET_PACKED; | 253 | uint16_t config_size GNUNET_PACKED; |
273 | 254 | ||
274 | /* followed by serialized peer configuration; | 255 | /* followed by serialized peer configuration; |
275 | * gzip'ed configuration file in INI format */ | 256 | * gzip'ed configuration file in INI format */ |
276 | |||
277 | }; | 257 | }; |
278 | 258 | ||
279 | 259 | ||
@@ -281,9 +261,7 @@ struct GNUNET_TESTBED_PeerReconfigureMessage | |||
281 | * Message sent from client to testing service to | 261 | * Message sent from client to testing service to |
282 | * start a peer. | 262 | * start a peer. |
283 | */ | 263 | */ |
284 | struct GNUNET_TESTBED_PeerStartMessage | 264 | struct GNUNET_TESTBED_PeerStartMessage { |
285 | { | ||
286 | |||
287 | /** | 265 | /** |
288 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_START_PEER | 266 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_START_PEER |
289 | */ | 267 | */ |
@@ -298,7 +276,6 @@ struct GNUNET_TESTBED_PeerStartMessage | |||
298 | * Operation ID that is used to identify this operation. | 276 | * Operation ID that is used to identify this operation. |
299 | */ | 277 | */ |
300 | uint64_t operation_id GNUNET_PACKED; | 278 | uint64_t operation_id GNUNET_PACKED; |
301 | |||
302 | }; | 279 | }; |
303 | 280 | ||
304 | 281 | ||
@@ -306,9 +283,7 @@ struct GNUNET_TESTBED_PeerStartMessage | |||
306 | * Message sent from client to testing service to | 283 | * Message sent from client to testing service to |
307 | * stop a peer. | 284 | * stop a peer. |
308 | */ | 285 | */ |
309 | struct GNUNET_TESTBED_PeerStopMessage | 286 | struct GNUNET_TESTBED_PeerStopMessage { |
310 | { | ||
311 | |||
312 | /** | 287 | /** |
313 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER | 288 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER |
314 | */ | 289 | */ |
@@ -323,7 +298,6 @@ struct GNUNET_TESTBED_PeerStopMessage | |||
323 | * Operation ID that is used to identify this operation. | 298 | * Operation ID that is used to identify this operation. |
324 | */ | 299 | */ |
325 | uint64_t operation_id GNUNET_PACKED; | 300 | uint64_t operation_id GNUNET_PACKED; |
326 | |||
327 | }; | 301 | }; |
328 | 302 | ||
329 | 303 | ||
@@ -331,9 +305,7 @@ struct GNUNET_TESTBED_PeerStopMessage | |||
331 | * Message sent from client to testing service to | 305 | * Message sent from client to testing service to |
332 | * destroy a (stopped) peer. | 306 | * destroy a (stopped) peer. |
333 | */ | 307 | */ |
334 | struct GNUNET_TESTBED_PeerDestroyMessage | 308 | struct GNUNET_TESTBED_PeerDestroyMessage { |
335 | { | ||
336 | |||
337 | /** | 309 | /** |
338 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER | 310 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER |
339 | */ | 311 | */ |
@@ -348,7 +320,6 @@ struct GNUNET_TESTBED_PeerDestroyMessage | |||
348 | * Operation ID that is used to identify this operation. | 320 | * Operation ID that is used to identify this operation. |
349 | */ | 321 | */ |
350 | uint64_t operation_id GNUNET_PACKED; | 322 | uint64_t operation_id GNUNET_PACKED; |
351 | |||
352 | }; | 323 | }; |
353 | 324 | ||
354 | 325 | ||
@@ -356,9 +327,7 @@ struct GNUNET_TESTBED_PeerDestroyMessage | |||
356 | * Message sent from client to testing service to | 327 | * Message sent from client to testing service to |
357 | * (re)configure a "physical" link between two peers. | 328 | * (re)configure a "physical" link between two peers. |
358 | */ | 329 | */ |
359 | struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage | 330 | struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage { |
360 | { | ||
361 | |||
362 | /** | 331 | /** |
363 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK | 332 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK |
364 | */ | 333 | */ |
@@ -385,7 +354,6 @@ struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage | |||
385 | uint64_t operation_id GNUNET_PACKED; | 354 | uint64_t operation_id GNUNET_PACKED; |
386 | 355 | ||
387 | /* followed by option-dependent variable-size values */ | 356 | /* followed by option-dependent variable-size values */ |
388 | |||
389 | }; | 357 | }; |
390 | 358 | ||
391 | 359 | ||
@@ -393,9 +361,7 @@ struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage | |||
393 | * Message sent from client to testing service to | 361 | * Message sent from client to testing service to |
394 | * connect two peers. | 362 | * connect two peers. |
395 | */ | 363 | */ |
396 | struct GNUNET_TESTBED_OverlayConnectMessage | 364 | struct GNUNET_TESTBED_OverlayConnectMessage { |
397 | { | ||
398 | |||
399 | /** | 365 | /** |
400 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT | 366 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT |
401 | */ | 367 | */ |
@@ -420,7 +386,6 @@ struct GNUNET_TESTBED_OverlayConnectMessage | |||
420 | * The ID of the host which runs peer2 | 386 | * The ID of the host which runs peer2 |
421 | */ | 387 | */ |
422 | uint32_t peer2_host_id GNUNET_PACKED; | 388 | uint32_t peer2_host_id GNUNET_PACKED; |
423 | |||
424 | }; | 389 | }; |
425 | 390 | ||
426 | 391 | ||
@@ -428,8 +393,7 @@ struct GNUNET_TESTBED_OverlayConnectMessage | |||
428 | * Message sent from host controller of a peer(A) to the host controller of | 393 | * Message sent from host controller of a peer(A) to the host controller of |
429 | * another peer(B) to request B to connect to A | 394 | * another peer(B) to request B to connect to A |
430 | */ | 395 | */ |
431 | struct GNUNET_TESTBED_RemoteOverlayConnectMessage | 396 | struct GNUNET_TESTBED_RemoteOverlayConnectMessage { |
432 | { | ||
433 | /** | 397 | /** |
434 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT | 398 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT |
435 | */ | 399 | */ |
@@ -456,16 +420,13 @@ struct GNUNET_TESTBED_RemoteOverlayConnectMessage | |||
456 | struct GNUNET_MessageHeader hello[0]; | 420 | struct GNUNET_MessageHeader hello[0]; |
457 | // FIXME: we usually do not use this gcc-hack as some | 421 | // FIXME: we usually do not use this gcc-hack as some |
458 | // compilers / tools really get messed up by it... | 422 | // compilers / tools really get messed up by it... |
459 | |||
460 | }; | 423 | }; |
461 | 424 | ||
462 | 425 | ||
463 | /** | 426 | /** |
464 | * Event notification from a controller to a client. | 427 | * Event notification from a controller to a client. |
465 | */ | 428 | */ |
466 | struct GNUNET_TESTBED_PeerEventMessage | 429 | struct GNUNET_TESTBED_PeerEventMessage { |
467 | { | ||
468 | |||
469 | /** | 430 | /** |
470 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT | 431 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT |
471 | */ | 432 | */ |
@@ -491,16 +452,13 @@ struct GNUNET_TESTBED_PeerEventMessage | |||
491 | * Operation ID that is used to identify this operation. | 452 | * Operation ID that is used to identify this operation. |
492 | */ | 453 | */ |
493 | uint64_t operation_id GNUNET_PACKED; | 454 | uint64_t operation_id GNUNET_PACKED; |
494 | |||
495 | }; | 455 | }; |
496 | 456 | ||
497 | 457 | ||
498 | /** | 458 | /** |
499 | * Event notification from a controller to a client. | 459 | * Event notification from a controller to a client. |
500 | */ | 460 | */ |
501 | struct GNUNET_TESTBED_ConnectionEventMessage | 461 | struct GNUNET_TESTBED_ConnectionEventMessage { |
502 | { | ||
503 | |||
504 | /** | 462 | /** |
505 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT | 463 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT |
506 | */ | 464 | */ |
@@ -526,16 +484,13 @@ struct GNUNET_TESTBED_ConnectionEventMessage | |||
526 | * Operation ID that is used to identify this operation. | 484 | * Operation ID that is used to identify this operation. |
527 | */ | 485 | */ |
528 | uint64_t operation_id GNUNET_PACKED; | 486 | uint64_t operation_id GNUNET_PACKED; |
529 | |||
530 | }; | 487 | }; |
531 | 488 | ||
532 | 489 | ||
533 | /** | 490 | /** |
534 | * Event notification from a controller to a client. | 491 | * Event notification from a controller to a client. |
535 | */ | 492 | */ |
536 | struct GNUNET_TESTBED_OperationFailureEventMessage | 493 | struct GNUNET_TESTBED_OperationFailureEventMessage { |
537 | { | ||
538 | |||
539 | /** | 494 | /** |
540 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT | 495 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT |
541 | */ | 496 | */ |
@@ -553,16 +508,13 @@ struct GNUNET_TESTBED_OperationFailureEventMessage | |||
553 | uint64_t operation_id GNUNET_PACKED; | 508 | uint64_t operation_id GNUNET_PACKED; |
554 | 509 | ||
555 | /* followed by 0-terminated error message */ | 510 | /* followed by 0-terminated error message */ |
556 | |||
557 | }; | 511 | }; |
558 | 512 | ||
559 | 513 | ||
560 | /** | 514 | /** |
561 | * Event notification from a controller to a client. | 515 | * Event notification from a controller to a client. |
562 | */ | 516 | */ |
563 | struct GNUNET_TESTBED_PeerCreateSuccessEventMessage | 517 | struct GNUNET_TESTBED_PeerCreateSuccessEventMessage { |
564 | { | ||
565 | |||
566 | /** | 518 | /** |
567 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS | 519 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS |
568 | */ | 520 | */ |
@@ -577,7 +529,6 @@ struct GNUNET_TESTBED_PeerCreateSuccessEventMessage | |||
577 | * Operation ID of the operation that created this event. | 529 | * Operation ID of the operation that created this event. |
578 | */ | 530 | */ |
579 | uint64_t operation_id GNUNET_PACKED; | 531 | uint64_t operation_id GNUNET_PACKED; |
580 | |||
581 | }; | 532 | }; |
582 | 533 | ||
583 | 534 | ||
@@ -586,9 +537,7 @@ struct GNUNET_TESTBED_PeerCreateSuccessEventMessage | |||
586 | * a generic operational success where the operation does | 537 | * a generic operational success where the operation does |
587 | * not return any data. | 538 | * not return any data. |
588 | */ | 539 | */ |
589 | struct GNUNET_TESTBED_GenericOperationSuccessEventMessage | 540 | struct GNUNET_TESTBED_GenericOperationSuccessEventMessage { |
590 | { | ||
591 | |||
592 | /** | 541 | /** |
593 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS | 542 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS |
594 | */ | 543 | */ |
@@ -604,7 +553,6 @@ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage | |||
604 | * Operation ID of the operation that created this event. | 553 | * Operation ID of the operation that created this event. |
605 | */ | 554 | */ |
606 | uint64_t operation_id GNUNET_PACKED; | 555 | uint64_t operation_id GNUNET_PACKED; |
607 | |||
608 | }; | 556 | }; |
609 | 557 | ||
610 | 558 | ||
@@ -612,9 +560,7 @@ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage | |||
612 | * Message sent from client to testing service to | 560 | * Message sent from client to testing service to |
613 | * obtain the configuration of a peer. | 561 | * obtain the configuration of a peer. |
614 | */ | 562 | */ |
615 | struct GNUNET_TESTBED_PeerGetConfigurationMessage | 563 | struct GNUNET_TESTBED_PeerGetConfigurationMessage { |
616 | { | ||
617 | |||
618 | /** | 564 | /** |
619 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION | 565 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION |
620 | */ | 566 | */ |
@@ -629,16 +575,13 @@ struct GNUNET_TESTBED_PeerGetConfigurationMessage | |||
629 | * Operation ID that is used to identify this operation. | 575 | * Operation ID that is used to identify this operation. |
630 | */ | 576 | */ |
631 | uint64_t operation_id GNUNET_PACKED; | 577 | uint64_t operation_id GNUNET_PACKED; |
632 | |||
633 | }; | 578 | }; |
634 | 579 | ||
635 | 580 | ||
636 | /** | 581 | /** |
637 | * Peer configuration and identity reply from controller to a client. | 582 | * Peer configuration and identity reply from controller to a client. |
638 | */ | 583 | */ |
639 | struct GNUNET_TESTBED_PeerConfigurationInformationMessage | 584 | struct GNUNET_TESTBED_PeerConfigurationInformationMessage { |
640 | { | ||
641 | |||
642 | /** | 585 | /** |
643 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION | 586 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION |
644 | */ | 587 | */ |
@@ -665,15 +608,13 @@ struct GNUNET_TESTBED_PeerConfigurationInformationMessage | |||
665 | uint16_t config_size GNUNET_PACKED; | 608 | uint16_t config_size GNUNET_PACKED; |
666 | 609 | ||
667 | /* followed by gzip-compressed configuration of the peer */ | 610 | /* followed by gzip-compressed configuration of the peer */ |
668 | |||
669 | }; | 611 | }; |
670 | 612 | ||
671 | 613 | ||
672 | /** | 614 | /** |
673 | * Message to request configuration of a slave controller | 615 | * Message to request configuration of a slave controller |
674 | */ | 616 | */ |
675 | struct GNUNET_TESTBED_SlaveGetConfigurationMessage | 617 | struct GNUNET_TESTBED_SlaveGetConfigurationMessage { |
676 | { | ||
677 | /** | 618 | /** |
678 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION | 619 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION |
679 | */ | 620 | */ |
@@ -688,15 +629,13 @@ struct GNUNET_TESTBED_SlaveGetConfigurationMessage | |||
688 | * Operation ID | 629 | * Operation ID |
689 | */ | 630 | */ |
690 | uint64_t operation_id GNUNET_PACKED; | 631 | uint64_t operation_id GNUNET_PACKED; |
691 | |||
692 | }; | 632 | }; |
693 | 633 | ||
694 | 634 | ||
695 | /** | 635 | /** |
696 | * Reply to #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION message | 636 | * Reply to #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION message |
697 | */ | 637 | */ |
698 | struct GNUNET_TESTBED_SlaveConfiguration | 638 | struct GNUNET_TESTBED_SlaveConfiguration { |
699 | { | ||
700 | /** | 639 | /** |
701 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION | 640 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION |
702 | */ | 641 | */ |
@@ -718,15 +657,13 @@ struct GNUNET_TESTBED_SlaveConfiguration | |||
718 | uint16_t config_size GNUNET_PACKED; | 657 | uint16_t config_size GNUNET_PACKED; |
719 | 658 | ||
720 | /* followed by gzip-compressed configuration of the peer */ | 659 | /* followed by gzip-compressed configuration of the peer */ |
721 | |||
722 | }; | 660 | }; |
723 | 661 | ||
724 | 662 | ||
725 | /** | 663 | /** |
726 | * Shutdown peers message | 664 | * Shutdown peers message |
727 | */ | 665 | */ |
728 | struct GNUNET_TESTBED_ShutdownPeersMessage | 666 | struct GNUNET_TESTBED_ShutdownPeersMessage { |
729 | { | ||
730 | /** | 667 | /** |
731 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS | 668 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS |
732 | */ | 669 | */ |
@@ -742,8 +679,7 @@ struct GNUNET_TESTBED_ShutdownPeersMessage | |||
742 | /** | 679 | /** |
743 | * Message to start/stop services of a peer | 680 | * Message to start/stop services of a peer |
744 | */ | 681 | */ |
745 | struct GNUNET_TESTBED_ManagePeerServiceMessage | 682 | struct GNUNET_TESTBED_ManagePeerServiceMessage { |
746 | { | ||
747 | /** | 683 | /** |
748 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS | 684 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS |
749 | */ | 685 | */ |
@@ -774,8 +710,7 @@ struct GNUNET_TESTBED_ManagePeerServiceMessage | |||
774 | * Message to send underlay link model of a peer. This message will be | 710 | * Message to send underlay link model of a peer. This message will be |
775 | * forwarded to the controller running the peer. | 711 | * forwarded to the controller running the peer. |
776 | */ | 712 | */ |
777 | struct GNUNET_TESTBED_UnderlayLinkModelMsg | 713 | struct GNUNET_TESTBED_UnderlayLinkModelMsg { |
778 | { | ||
779 | /** | 714 | /** |
780 | * Type is #GNUNET_MESSAGE_TYPE_UNDERLAYLINKMODELMSG | 715 | * Type is #GNUNET_MESSAGE_TYPE_UNDERLAYLINKMODELMSG |
781 | */ | 716 | */ |
@@ -801,7 +736,6 @@ struct GNUNET_TESTBED_UnderlayLinkModelMsg | |||
801 | * sequence of four integers of type uint32_t: peer_id, latency, loss and | 736 | * sequence of four integers of type uint32_t: peer_id, latency, loss and |
802 | * bandwidth. | 737 | * bandwidth. |
803 | */ | 738 | */ |
804 | |||
805 | }; | 739 | }; |
806 | 740 | ||
807 | 741 | ||
@@ -820,8 +754,7 @@ struct GNUNET_TESTBED_UnderlayLinkModelMsg | |||
820 | /** | 754 | /** |
821 | * Message to initialise a barrier | 755 | * Message to initialise a barrier |
822 | */ | 756 | */ |
823 | struct GNUNET_TESTBED_BarrierInit | 757 | struct GNUNET_TESTBED_BarrierInit { |
824 | { | ||
825 | /** | 758 | /** |
826 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT | 759 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT |
827 | */ | 760 | */ |
@@ -842,8 +775,7 @@ struct GNUNET_TESTBED_BarrierInit | |||
842 | /** | 775 | /** |
843 | * Message to cancel a barrier | 776 | * Message to cancel a barrier |
844 | */ | 777 | */ |
845 | struct GNUNET_TESTBED_BarrierCancel | 778 | struct GNUNET_TESTBED_BarrierCancel { |
846 | { | ||
847 | /** | 779 | /** |
848 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL | 780 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL |
849 | */ | 781 | */ |
@@ -859,8 +791,7 @@ struct GNUNET_TESTBED_BarrierCancel | |||
859 | /** | 791 | /** |
860 | * Message for signalling status changes of a barrier | 792 | * Message for signalling status changes of a barrier |
861 | */ | 793 | */ |
862 | struct GNUNET_TESTBED_BarrierStatusMsg | 794 | struct GNUNET_TESTBED_BarrierStatusMsg { |
863 | { | ||
864 | /** | 795 | /** |
865 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS | 796 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS |
866 | */ | 797 | */ |
@@ -888,8 +819,7 @@ struct GNUNET_TESTBED_BarrierStatusMsg | |||
888 | * Message sent from peers to the testbed-barrier service to indicate that they | 819 | * Message sent from peers to the testbed-barrier service to indicate that they |
889 | * have reached a barrier and are waiting for it to be crossed | 820 | * have reached a barrier and are waiting for it to be crossed |
890 | */ | 821 | */ |
891 | struct GNUNET_TESTBED_BarrierWait | 822 | struct GNUNET_TESTBED_BarrierWait { |
892 | { | ||
893 | /** | 823 | /** |
894 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT | 824 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT |
895 | */ | 825 | */ |