diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-02-16 12:11:16 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-02-16 12:11:16 +0000 |
commit | 1ddfaae362fb43c7a032e347d082ed8a5dc3575d (patch) | |
tree | 8a6f000f7f0c0a7c5cbf842e8956b20684e8290f /src/include | |
parent | 5dec45de0465e2eb483c3df18773c0501992e183 (diff) | |
download | gnunet-1ddfaae362fb43c7a032e347d082ed8a5dc3575d.tar.gz gnunet-1ddfaae362fb43c7a032e347d082ed8a5dc3575d.zip |
api header changes
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_disk_lib.h | 8 | ||||
-rw-r--r-- | src/include/gnunet_os_lib.h | 5 | ||||
-rw-r--r-- | src/include/gnunet_testing_lib.h | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index fc5b9b5eb..f4ede1384 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h | |||
@@ -335,6 +335,14 @@ struct GNUNET_DISK_PipeHandle *GNUNET_DISK_pipe (int blocking); | |||
335 | */ | 335 | */ |
336 | int GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p); | 336 | int GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p); |
337 | 337 | ||
338 | /** | ||
339 | * Closes one half of an interprocess channel | ||
340 | * | ||
341 | * @param p pipe to close end of | ||
342 | * @param end which end of the pipe to close | ||
343 | */ | ||
344 | int | ||
345 | GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p, enum GNUNET_DISK_PipeEnd end); | ||
338 | 346 | ||
339 | /** | 347 | /** |
340 | * Close an open file. | 348 | * Close an open file. |
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index 3bc6eb5f9..02d1063f7 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h | |||
@@ -189,11 +189,14 @@ int GNUNET_OS_set_process_priority (pid_t proc, | |||
189 | /** | 189 | /** |
190 | * Start a process. | 190 | * Start a process. |
191 | * | 191 | * |
192 | * @param pipe_stdin pipe to use to send input to child process (or NULL) | ||
193 | * @param pipe_stdout pipe to use to get output from child process (or NULL) | ||
192 | * @param filename name of the binary | 194 | * @param filename name of the binary |
193 | * @param ... NULL-terminated list of arguments to the process | 195 | * @param ... NULL-terminated list of arguments to the process |
194 | * @return process ID of the new process, -1 on error | 196 | * @return process ID of the new process, -1 on error |
195 | */ | 197 | */ |
196 | pid_t GNUNET_OS_start_process (const char *filename, ...); | 198 | pid_t |
199 | GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin, struct GNUNET_DISK_PipeHandle *pipe_stdout, const char *filename, ...); | ||
197 | 200 | ||
198 | 201 | ||
199 | /** | 202 | /** |
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index 13dbc7a9e..9d48f4887 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h | |||
@@ -410,6 +410,11 @@ enum GNUNET_TESTING_Topology | |||
410 | GNUNET_TESTING_TOPOLOGY_SMALL_WORLD, | 410 | GNUNET_TESTING_TOPOLOGY_SMALL_WORLD, |
411 | 411 | ||
412 | /** | 412 | /** |
413 | * Small-world network (ring plus random links). | ||
414 | */ | ||
415 | GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING, | ||
416 | |||
417 | /** | ||
413 | * Ring topology. | 418 | * Ring topology. |
414 | */ | 419 | */ |
415 | GNUNET_TESTING_TOPOLOGY_RING, | 420 | GNUNET_TESTING_TOPOLOGY_RING, |