diff options
Diffstat (limited to 'src/testbed/testbed.h')
-rw-r--r-- | src/testbed/testbed.h | 87 |
1 files changed, 58 insertions, 29 deletions
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index 8ab957b88..0f86c149b 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h | |||
@@ -33,7 +33,8 @@ 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 | { | ||
37 | /** | 38 | /** |
38 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_INIT | 39 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_INIT |
39 | */ | 40 | */ |
@@ -60,7 +61,8 @@ struct GNUNET_TESTBED_InitMessage { | |||
60 | /** | 61 | /** |
61 | * Notify the service about a host that we intend to use. | 62 | * Notify the service about a host that we intend to use. |
62 | */ | 63 | */ |
63 | struct GNUNET_TESTBED_AddHostMessage { | 64 | struct GNUNET_TESTBED_AddHostMessage |
65 | { | ||
64 | /** | 66 | /** |
65 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST | 67 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST |
66 | */ | 68 | */ |
@@ -109,7 +111,8 @@ struct GNUNET_TESTBED_AddHostMessage { | |||
109 | * worked (or failed). | 111 | * worked (or failed). |
110 | * FIXME: Where is this required? | 112 | * FIXME: Where is this required? |
111 | */ | 113 | */ |
112 | struct GNUNET_TESTBED_HostConfirmedMessage { | 114 | struct GNUNET_TESTBED_HostConfirmedMessage |
115 | { | ||
113 | /** | 116 | /** |
114 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS | 117 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS |
115 | */ | 118 | */ |
@@ -130,7 +133,8 @@ struct GNUNET_TESTBED_HostConfirmedMessage { | |||
130 | * requests for a particular client to a particular | 133 | * requests for a particular client to a particular |
131 | * sub-controller. | 134 | * sub-controller. |
132 | */ | 135 | */ |
133 | struct GNUNET_TESTBED_ControllerLinkRequest { | 136 | struct GNUNET_TESTBED_ControllerLinkRequest |
137 | { | ||
134 | /** | 138 | /** |
135 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS | 139 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS |
136 | */ | 140 | */ |
@@ -162,7 +166,8 @@ struct GNUNET_TESTBED_ControllerLinkRequest { | |||
162 | /** | 166 | /** |
163 | * Response message for ControllerLinkRequest message | 167 | * Response message for ControllerLinkRequest message |
164 | */ | 168 | */ |
165 | struct GNUNET_TESTBED_ControllerLinkResponse { | 169 | struct GNUNET_TESTBED_ControllerLinkResponse |
170 | { | ||
166 | /** | 171 | /** |
167 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT | 172 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT |
168 | */ | 173 | */ |
@@ -196,7 +201,8 @@ struct GNUNET_TESTBED_ControllerLinkResponse { | |||
196 | * Message sent from client to testing service to | 201 | * Message sent from client to testing service to |
197 | * create (configure, but not start) a peer. | 202 | * create (configure, but not start) a peer. |
198 | */ | 203 | */ |
199 | struct GNUNET_TESTBED_PeerCreateMessage { | 204 | struct GNUNET_TESTBED_PeerCreateMessage |
205 | { | ||
200 | /** | 206 | /** |
201 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER | 207 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER |
202 | */ | 208 | */ |
@@ -231,7 +237,8 @@ struct GNUNET_TESTBED_PeerCreateMessage { | |||
231 | * Message sent from client to testing service to | 237 | * Message sent from client to testing service to |
232 | * reconfigure a (stopped) a peer. | 238 | * reconfigure a (stopped) a peer. |
233 | */ | 239 | */ |
234 | struct GNUNET_TESTBED_PeerReconfigureMessage { | 240 | struct GNUNET_TESTBED_PeerReconfigureMessage |
241 | { | ||
235 | /** | 242 | /** |
236 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER | 243 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_RECONFIGURE_PEER |
237 | */ | 244 | */ |
@@ -261,7 +268,8 @@ struct GNUNET_TESTBED_PeerReconfigureMessage { | |||
261 | * Message sent from client to testing service to | 268 | * Message sent from client to testing service to |
262 | * start a peer. | 269 | * start a peer. |
263 | */ | 270 | */ |
264 | struct GNUNET_TESTBED_PeerStartMessage { | 271 | struct GNUNET_TESTBED_PeerStartMessage |
272 | { | ||
265 | /** | 273 | /** |
266 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_START_PEER | 274 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_START_PEER |
267 | */ | 275 | */ |
@@ -283,7 +291,8 @@ struct GNUNET_TESTBED_PeerStartMessage { | |||
283 | * Message sent from client to testing service to | 291 | * Message sent from client to testing service to |
284 | * stop a peer. | 292 | * stop a peer. |
285 | */ | 293 | */ |
286 | struct GNUNET_TESTBED_PeerStopMessage { | 294 | struct GNUNET_TESTBED_PeerStopMessage |
295 | { | ||
287 | /** | 296 | /** |
288 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER | 297 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER |
289 | */ | 298 | */ |
@@ -305,7 +314,8 @@ struct GNUNET_TESTBED_PeerStopMessage { | |||
305 | * Message sent from client to testing service to | 314 | * Message sent from client to testing service to |
306 | * destroy a (stopped) peer. | 315 | * destroy a (stopped) peer. |
307 | */ | 316 | */ |
308 | struct GNUNET_TESTBED_PeerDestroyMessage { | 317 | struct GNUNET_TESTBED_PeerDestroyMessage |
318 | { | ||
309 | /** | 319 | /** |
310 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER | 320 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER |
311 | */ | 321 | */ |
@@ -327,7 +337,8 @@ struct GNUNET_TESTBED_PeerDestroyMessage { | |||
327 | * Message sent from client to testing service to | 337 | * Message sent from client to testing service to |
328 | * (re)configure a "physical" link between two peers. | 338 | * (re)configure a "physical" link between two peers. |
329 | */ | 339 | */ |
330 | struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage { | 340 | struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage |
341 | { | ||
331 | /** | 342 | /** |
332 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK | 343 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CONFIGURE_UNDERLAY_LINK |
333 | */ | 344 | */ |
@@ -361,7 +372,8 @@ struct GNUNET_TESTBED_ConfigureUnderlayLinkMessage { | |||
361 | * Message sent from client to testing service to | 372 | * Message sent from client to testing service to |
362 | * connect two peers. | 373 | * connect two peers. |
363 | */ | 374 | */ |
364 | struct GNUNET_TESTBED_OverlayConnectMessage { | 375 | struct GNUNET_TESTBED_OverlayConnectMessage |
376 | { | ||
365 | /** | 377 | /** |
366 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT | 378 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT |
367 | */ | 379 | */ |
@@ -393,7 +405,8 @@ struct GNUNET_TESTBED_OverlayConnectMessage { | |||
393 | * Message sent from host controller of a peer(A) to the host controller of | 405 | * Message sent from host controller of a peer(A) to the host controller of |
394 | * another peer(B) to request B to connect to A | 406 | * another peer(B) to request B to connect to A |
395 | */ | 407 | */ |
396 | struct GNUNET_TESTBED_RemoteOverlayConnectMessage { | 408 | struct GNUNET_TESTBED_RemoteOverlayConnectMessage |
409 | { | ||
397 | /** | 410 | /** |
398 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT | 411 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_REMOTE_OVERLAY_CONNECT |
399 | */ | 412 | */ |
@@ -426,7 +439,8 @@ struct GNUNET_TESTBED_RemoteOverlayConnectMessage { | |||
426 | /** | 439 | /** |
427 | * Event notification from a controller to a client. | 440 | * Event notification from a controller to a client. |
428 | */ | 441 | */ |
429 | struct GNUNET_TESTBED_PeerEventMessage { | 442 | struct GNUNET_TESTBED_PeerEventMessage |
443 | { | ||
430 | /** | 444 | /** |
431 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT | 445 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT |
432 | */ | 446 | */ |
@@ -458,7 +472,8 @@ struct GNUNET_TESTBED_PeerEventMessage { | |||
458 | /** | 472 | /** |
459 | * Event notification from a controller to a client. | 473 | * Event notification from a controller to a client. |
460 | */ | 474 | */ |
461 | struct GNUNET_TESTBED_ConnectionEventMessage { | 475 | struct GNUNET_TESTBED_ConnectionEventMessage |
476 | { | ||
462 | /** | 477 | /** |
463 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT | 478 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT |
464 | */ | 479 | */ |
@@ -490,7 +505,8 @@ struct GNUNET_TESTBED_ConnectionEventMessage { | |||
490 | /** | 505 | /** |
491 | * Event notification from a controller to a client. | 506 | * Event notification from a controller to a client. |
492 | */ | 507 | */ |
493 | struct GNUNET_TESTBED_OperationFailureEventMessage { | 508 | struct GNUNET_TESTBED_OperationFailureEventMessage |
509 | { | ||
494 | /** | 510 | /** |
495 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT | 511 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT |
496 | */ | 512 | */ |
@@ -514,7 +530,8 @@ struct GNUNET_TESTBED_OperationFailureEventMessage { | |||
514 | /** | 530 | /** |
515 | * Event notification from a controller to a client. | 531 | * Event notification from a controller to a client. |
516 | */ | 532 | */ |
517 | struct GNUNET_TESTBED_PeerCreateSuccessEventMessage { | 533 | struct GNUNET_TESTBED_PeerCreateSuccessEventMessage |
534 | { | ||
518 | /** | 535 | /** |
519 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS | 536 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS |
520 | */ | 537 | */ |
@@ -537,7 +554,8 @@ struct GNUNET_TESTBED_PeerCreateSuccessEventMessage { | |||
537 | * a generic operational success where the operation does | 554 | * a generic operational success where the operation does |
538 | * not return any data. | 555 | * not return any data. |
539 | */ | 556 | */ |
540 | struct GNUNET_TESTBED_GenericOperationSuccessEventMessage { | 557 | struct GNUNET_TESTBED_GenericOperationSuccessEventMessage |
558 | { | ||
541 | /** | 559 | /** |
542 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS | 560 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS |
543 | */ | 561 | */ |
@@ -560,7 +578,8 @@ struct GNUNET_TESTBED_GenericOperationSuccessEventMessage { | |||
560 | * Message sent from client to testing service to | 578 | * Message sent from client to testing service to |
561 | * obtain the configuration of a peer. | 579 | * obtain the configuration of a peer. |
562 | */ | 580 | */ |
563 | struct GNUNET_TESTBED_PeerGetConfigurationMessage { | 581 | struct GNUNET_TESTBED_PeerGetConfigurationMessage |
582 | { | ||
564 | /** | 583 | /** |
565 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION | 584 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION |
566 | */ | 585 | */ |
@@ -581,7 +600,8 @@ struct GNUNET_TESTBED_PeerGetConfigurationMessage { | |||
581 | /** | 600 | /** |
582 | * Peer configuration and identity reply from controller to a client. | 601 | * Peer configuration and identity reply from controller to a client. |
583 | */ | 602 | */ |
584 | struct GNUNET_TESTBED_PeerConfigurationInformationMessage { | 603 | struct GNUNET_TESTBED_PeerConfigurationInformationMessage |
604 | { | ||
585 | /** | 605 | /** |
586 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION | 606 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION |
587 | */ | 607 | */ |
@@ -614,7 +634,8 @@ struct GNUNET_TESTBED_PeerConfigurationInformationMessage { | |||
614 | /** | 634 | /** |
615 | * Message to request configuration of a slave controller | 635 | * Message to request configuration of a slave controller |
616 | */ | 636 | */ |
617 | struct GNUNET_TESTBED_SlaveGetConfigurationMessage { | 637 | struct GNUNET_TESTBED_SlaveGetConfigurationMessage |
638 | { | ||
618 | /** | 639 | /** |
619 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION | 640 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION |
620 | */ | 641 | */ |
@@ -635,7 +656,8 @@ struct GNUNET_TESTBED_SlaveGetConfigurationMessage { | |||
635 | /** | 656 | /** |
636 | * Reply to #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION message | 657 | * Reply to #GNUNET_MESSAGE_TYPE_TESTBED_GET_SLAVE_CONFIGURATION message |
637 | */ | 658 | */ |
638 | struct GNUNET_TESTBED_SlaveConfiguration { | 659 | struct GNUNET_TESTBED_SlaveConfiguration |
660 | { | ||
639 | /** | 661 | /** |
640 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION | 662 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION |
641 | */ | 663 | */ |
@@ -663,7 +685,8 @@ struct GNUNET_TESTBED_SlaveConfiguration { | |||
663 | /** | 685 | /** |
664 | * Shutdown peers message | 686 | * Shutdown peers message |
665 | */ | 687 | */ |
666 | struct GNUNET_TESTBED_ShutdownPeersMessage { | 688 | struct GNUNET_TESTBED_ShutdownPeersMessage |
689 | { | ||
667 | /** | 690 | /** |
668 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS | 691 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS |
669 | */ | 692 | */ |
@@ -679,7 +702,8 @@ struct GNUNET_TESTBED_ShutdownPeersMessage { | |||
679 | /** | 702 | /** |
680 | * Message to start/stop services of a peer | 703 | * Message to start/stop services of a peer |
681 | */ | 704 | */ |
682 | struct GNUNET_TESTBED_ManagePeerServiceMessage { | 705 | struct GNUNET_TESTBED_ManagePeerServiceMessage |
706 | { | ||
683 | /** | 707 | /** |
684 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS | 708 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_SHUTDOWN_PEERS |
685 | */ | 709 | */ |
@@ -710,7 +734,8 @@ struct GNUNET_TESTBED_ManagePeerServiceMessage { | |||
710 | * Message to send underlay link model of a peer. This message will be | 734 | * Message to send underlay link model of a peer. This message will be |
711 | * forwarded to the controller running the peer. | 735 | * forwarded to the controller running the peer. |
712 | */ | 736 | */ |
713 | struct GNUNET_TESTBED_UnderlayLinkModelMsg { | 737 | struct GNUNET_TESTBED_UnderlayLinkModelMsg |
738 | { | ||
714 | /** | 739 | /** |
715 | * Type is #GNUNET_MESSAGE_TYPE_UNDERLAYLINKMODELMSG | 740 | * Type is #GNUNET_MESSAGE_TYPE_UNDERLAYLINKMODELMSG |
716 | */ | 741 | */ |
@@ -754,7 +779,8 @@ struct GNUNET_TESTBED_UnderlayLinkModelMsg { | |||
754 | /** | 779 | /** |
755 | * Message to initialise a barrier | 780 | * Message to initialise a barrier |
756 | */ | 781 | */ |
757 | struct GNUNET_TESTBED_BarrierInit { | 782 | struct GNUNET_TESTBED_BarrierInit |
783 | { | ||
758 | /** | 784 | /** |
759 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT | 785 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_INIT |
760 | */ | 786 | */ |
@@ -775,7 +801,8 @@ struct GNUNET_TESTBED_BarrierInit { | |||
775 | /** | 801 | /** |
776 | * Message to cancel a barrier | 802 | * Message to cancel a barrier |
777 | */ | 803 | */ |
778 | struct GNUNET_TESTBED_BarrierCancel { | 804 | struct GNUNET_TESTBED_BarrierCancel |
805 | { | ||
779 | /** | 806 | /** |
780 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL | 807 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_CANCEL |
781 | */ | 808 | */ |
@@ -791,7 +818,8 @@ struct GNUNET_TESTBED_BarrierCancel { | |||
791 | /** | 818 | /** |
792 | * Message for signalling status changes of a barrier | 819 | * Message for signalling status changes of a barrier |
793 | */ | 820 | */ |
794 | struct GNUNET_TESTBED_BarrierStatusMsg { | 821 | struct GNUNET_TESTBED_BarrierStatusMsg |
822 | { | ||
795 | /** | 823 | /** |
796 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS | 824 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS |
797 | */ | 825 | */ |
@@ -819,7 +847,8 @@ struct GNUNET_TESTBED_BarrierStatusMsg { | |||
819 | * Message sent from peers to the testbed-barrier service to indicate that they | 847 | * Message sent from peers to the testbed-barrier service to indicate that they |
820 | * have reached a barrier and are waiting for it to be crossed | 848 | * have reached a barrier and are waiting for it to be crossed |
821 | */ | 849 | */ |
822 | struct GNUNET_TESTBED_BarrierWait { | 850 | struct GNUNET_TESTBED_BarrierWait |
851 | { | ||
823 | /** | 852 | /** |
824 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT | 853 | * Type is #GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_WAIT |
825 | */ | 854 | */ |