diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-14 09:25:54 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-14 09:25:54 +0000 |
commit | da1f2411d623d100d9df6a72c6081ccaccc23d13 (patch) | |
tree | 81fd3d43d9f7220896aa6367469daa1ba479fb4a /src/testbed/testbed_api_hosts.h | |
parent | 3ced678ccb6e8c7ceacc96bfc0281470b81c189d (diff) | |
download | gnunet-da1f2411d623d100d9df6a72c6081ccaccc23d13.tar.gz gnunet-da1f2411d623d100d9df6a72c6081ccaccc23d13.zip |
-testbed hackery
Diffstat (limited to 'src/testbed/testbed_api_hosts.h')
-rw-r--r-- | src/testbed/testbed_api_hosts.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h index 0c36da0ee..eaf2a4d11 100644 --- a/src/testbed/testbed_api_hosts.h +++ b/src/testbed/testbed_api_hosts.h | |||
@@ -55,25 +55,6 @@ GNUNET_TESTBED_host_create_by_id_ (uint32_t id); | |||
55 | 55 | ||
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Create a host to run peers and controllers on. This function is used | ||
59 | * if a peer learns about a host via IPC between controllers (and thus | ||
60 | * some higher-level controller has already determined the unique IDs). | ||
61 | * | ||
62 | * @param id global host ID assigned to the host; 0 is | ||
63 | * reserved to always mean 'localhost' | ||
64 | * @param hostname name of the host, use "NULL" for localhost | ||
65 | * @param username username to use for the login; may be NULL | ||
66 | * @param port port number to use for ssh; use 0 to let ssh decide | ||
67 | * @return handle to the host, NULL on error | ||
68 | */ | ||
69 | struct GNUNET_TESTBED_Host * | ||
70 | GNUNET_TESTBED_host_create_with_id_ (uint32_t id, | ||
71 | const char *hostname, | ||
72 | const char *username, | ||
73 | uint16_t port); | ||
74 | |||
75 | |||
76 | /** | ||
77 | * Obtain a host's unique global ID. | 58 | * Obtain a host's unique global ID. |
78 | * | 59 | * |
79 | * @param host handle to the host, NULL means 'localhost' | 60 | * @param host handle to the host, NULL means 'localhost' |
@@ -98,14 +79,11 @@ struct GNUNET_TESTBED_HelperHandle; | |||
98 | * | 79 | * |
99 | * @param host host to use, use "NULL" for localhost | 80 | * @param host host to use, use "NULL" for localhost |
100 | * @param binary_argv binary name and command-line arguments to give to the binary | 81 | * @param binary_argv binary name and command-line arguments to give to the binary |
101 | * @param cb function to call for messages received from the binary | ||
102 | * @param cb_cls closure for cb | ||
103 | * @return handle to terminate the command, NULL on error | 82 | * @return handle to terminate the command, NULL on error |
104 | */ | 83 | */ |
105 | struct GNUNET_TESTBED_HelperHandle * | 84 | struct GNUNET_TESTBED_HelperHandle * |
106 | GNUNET_TESTBED_host_run_ (struct GNUNET_TESTBED_Host *host, | 85 | GNUNET_TESTBED_host_run_ (const struct GNUNET_TESTBED_Host *host, |
107 | char *const binary_argv[], | 86 | char *const binary_argv[]); |
108 | GNUNET_SERVER_MessageTokenizerCallback cb, void *cb_cls); | ||
109 | 87 | ||
110 | 88 | ||
111 | /** | 89 | /** |