diff options
Diffstat (limited to 'src/include/gnunet_testbed_service.h')
-rw-r--r-- | src/include/gnunet_testbed_service.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 3c2d93272..25378e890 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -75,12 +75,16 @@ struct GNUNET_TESTBED_Controller; | |||
75 | * | 75 | * |
76 | * @param hostname name of the host, use "NULL" for localhost | 76 | * @param hostname name of the host, use "NULL" for localhost |
77 | * @param username username to use for the login; may be NULL | 77 | * @param username username to use for the login; may be NULL |
78 | * @param cfg the configuration to use as a template while starting a controller | ||
79 | * on this host. Operation queue sizes specific to a host are also | ||
80 | * read from this configuration handle | ||
78 | * @param port port number to use for ssh; use 0 to let ssh decide | 81 | * @param port port number to use for ssh; use 0 to let ssh decide |
79 | * @return handle to the host, NULL on error | 82 | * @return handle to the host, NULL on error |
80 | */ | 83 | */ |
81 | struct GNUNET_TESTBED_Host * | 84 | struct GNUNET_TESTBED_Host * |
82 | GNUNET_TESTBED_host_create (const char *hostname, | 85 | GNUNET_TESTBED_host_create (const char *hostname, |
83 | const char *username, | 86 | const char *username, |
87 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
84 | uint16_t port); | 88 | uint16_t port); |
85 | 89 | ||
86 | 90 | ||
@@ -94,6 +98,9 @@ GNUNET_TESTBED_host_create (const char *hostname, | |||
94 | * reserved to always mean 'localhost' | 98 | * reserved to always mean 'localhost' |
95 | * @param hostname name of the host, use "NULL" for localhost | 99 | * @param hostname name of the host, use "NULL" for localhost |
96 | * @param username username to use for the login; may be NULL | 100 | * @param username username to use for the login; may be NULL |
101 | * @param cfg the configuration to use as a template while starting a controller | ||
102 | * on this host. Operation queue sizes specific to a host are also | ||
103 | * read from this configuration handle | ||
97 | * @param port port number to use for ssh; use 0 to let ssh decide | 104 | * @param port port number to use for ssh; use 0 to let ssh decide |
98 | * @return handle to the host, NULL on error | 105 | * @return handle to the host, NULL on error |
99 | */ | 106 | */ |
@@ -101,6 +108,8 @@ struct GNUNET_TESTBED_Host * | |||
101 | GNUNET_TESTBED_host_create_with_id (uint32_t id, | 108 | GNUNET_TESTBED_host_create_with_id (uint32_t id, |
102 | const char *hostname, | 109 | const char *hostname, |
103 | const char *username, | 110 | const char *username, |
111 | const struct GNUNET_CONFIGURATION_Handle | ||
112 | *cfg, | ||
104 | uint16_t port); | 113 | uint16_t port); |
105 | 114 | ||
106 | 115 | ||
@@ -108,12 +117,17 @@ GNUNET_TESTBED_host_create_with_id (uint32_t id, | |||
108 | * Load a set of hosts from a configuration file. | 117 | * Load a set of hosts from a configuration file. |
109 | * | 118 | * |
110 | * @param filename file with the host specification | 119 | * @param filename file with the host specification |
120 | * @param cfg the configuration to use as a template while starting a controller | ||
121 | * on any of the loaded hosts. Operation queue sizes specific to a host | ||
122 | * are also read from this configuration handle | ||
111 | * @param hosts set to the hosts found in the file; caller must free this if | 123 | * @param hosts set to the hosts found in the file; caller must free this if |
112 | * number of hosts returned is greater than 0 | 124 | * number of hosts returned is greater than 0 |
113 | * @return number of hosts returned in 'hosts', 0 on error | 125 | * @return number of hosts returned in 'hosts', 0 on error |
114 | */ | 126 | */ |
115 | unsigned int | 127 | unsigned int |
116 | GNUNET_TESTBED_hosts_load_from_file (const char *filename, | 128 | GNUNET_TESTBED_hosts_load_from_file (const char *filename, |
129 | const struct GNUNET_CONFIGURATION_Handle | ||
130 | *cfg, | ||
117 | struct GNUNET_TESTBED_Host ***hosts); | 131 | struct GNUNET_TESTBED_Host ***hosts); |
118 | 132 | ||
119 | 133 | ||