api header changes

diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index fc5b9b5eba58cfcc561922cd957a8e66fd5fb781..f4ede13845f122181cef5c8a235351eccfdb0111 100644 (file)
--- 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);
  */
 int GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p);
 
+/**
+ * Closes one half of an interprocess channel
+ *
+ * @param p pipe to close end of
+ * @param end which end of the pipe to close
+ */
+int
+GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p, enum GNUNET_DISK_PipeEnd end);
 
 /**
  * Close an open file.

diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 3bc6eb5f9cb197ae2daa19a8f2d56b912f479bfa..02d1063f7e1741fad5012d20bef66e3ac4bb2d1b 100644 (file)
--- 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,
 /**
  * Start a process.
  *
+ * @param pipe_stdin pipe to use to send input to child process (or NULL)
+ * @param pipe_stdout pipe to use to get output from child process (or NULL)
  * @param filename name of the binary
  * @param ... NULL-terminated list of arguments to the process
  * @return process ID of the new process, -1 on error
  */
-pid_t GNUNET_OS_start_process (const char *filename, ...);
+pid_t
+GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin, struct GNUNET_DISK_PipeHandle *pipe_stdout, const char *filename, ...);
 
 
 /**

diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 13dbc7a9e81e4c0ae9ca3117bd3748d3cace3bf5..9d48f4887d6c617d26e866b34ab6ce52b10c3995 100644 (file)
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -409,6 +409,11 @@ enum GNUNET_TESTING_Topology
    */
   GNUNET_TESTING_TOPOLOGY_SMALL_WORLD,
 
+  /**
+   * Small-world network (ring plus random links).
+   */
+  GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING,
+
   /**
    * Ring topology.
    */