[GNUnet-SVN] r6127 - GNUnet/src/include

[gnunet]

Author: nevans
Date: 2008-01-24 17:05:46 -0700 (Thu, 24 Jan 2008)
New Revision: 6127

Added:
   GNUnet/src/include/gnunet_remote_lib.h
Modified:
   GNUnet/src/include/Makefile.am
   GNUnet/src/include/gnunet_testing_lib.h
Log:
more

Modified: GNUnet/src/include/Makefile.am
===================================================================
--- GNUnet/src/include/Makefile.am      2008-01-25 00:05:23 UTC (rev 6126)
+++ GNUnet/src/include/Makefile.am      2008-01-25 00:05:46 UTC (rev 6127)
@@ -34,6 +34,7 @@
   gnunet_namespace_lib.h \
   gnunet_pingpong_service.h \
   gnunet_protocols.h \
+  gnunet_remote_lib.h \
   gnunet_rpc_lib.h \
   gnunet_rpc_service.h \
   gnunet_session_service.h \

Added: GNUnet/src/include/gnunet_remote_lib.h
===================================================================
--- GNUnet/src/include/gnunet_remote_lib.h                              (rev 0)
+++ GNUnet/src/include/gnunet_remote_lib.h      2008-01-25 00:05:46 UTC (rev 
6127)
@@ -0,0 +1,81 @@
+/*
+      This file is part of GNUnet
+      (C) 2008 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file include/gnunet_remote_lib.h
+ * @brief remote testing library for running gnunetd on multiple machines
+ * @author Nathan Evans
+ */
+
+#ifndef GNUNET_REMOTE_LIB_H
+#define GNUNET_REMOTE_LIB_H
+
+#include "gnunet_util.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
+/**
+ * Linked list of information about daemon processes.
+ */
+struct GNUNET_REMOTE_DaemonContext
+{
+  struct GNUNET_TESTING_DaemonContext *next;
+  GNUNET_PeerIdentity peer;
+  pid_t pid;
+  unsigned short port;
+  char *configFile;
+};
+
+
+int GNUNET_REMOTE_read_config(const char *config_file,struct 
GNUNET_GC_Configuration **newcfg);
+
+/**
+ * Starts a single gnunet daemon on a remote machine
+ *
+ * @param gnunetd_home directory where gnunetd is on remote machine
+ * @param localConfigPath local configuration path for config file
+ * @param remote_config_path remote path to copy local config to
+ * @param configFileName  file to copy and use on remote machine
+ * @param ip_address ip address of remote machine
+ * @param username username to use for ssh (assumed to be used with ssh-agent)
+ */
+int
+GNUNET_REMOTE_start_daemon (char *gnunetd_home,
+                             char *localConfigPath,char *configFileName,char 
*remote_config_path,char *ip_address,
+                             char *username);
+                             
+int GNUNET_REMOTE_start_daemons(struct GNUNET_GC_Configuration **newcfg);
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Modified: GNUnet/src/include/gnunet_testing_lib.h
===================================================================
--- GNUnet/src/include/gnunet_testing_lib.h     2008-01-25 00:05:23 UTC (rev 
6126)
+++ GNUnet/src/include/gnunet_testing_lib.h     2008-01-25 00:05:46 UTC (rev 
6127)
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2007 Christian Grothoff (and other contributing authors)
+      (C) 2008 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -126,28 +126,6 @@
  */
 int GNUNET_TESTING_stop_daemons (struct GNUNET_TESTING_DaemonContext *peers);
 
-int GNUNET_TESTING_remote_read_config(const char *config_file,struct 
GNUNET_GC_Configuration **newcfg);
-
-int GNUNET_TESTING_remote_check_config(struct GNUNET_GC_Configuration 
**newcfg);
-
-/**
- * Starts a single gnunet daemon on a remote machine
- *
- * @param gnunetd_home directory where gnunetd is on remote machine
- * @param localConfigPath local configuration path for config file
- * @param remote_config_path remote path to copy local config to
- * @param configFileName  file to copy and use on remote machine
- * @param ip_address ip address of remote machine
- * @param username username to use for ssh (assumed to be used with ssh-agent)
- */
-int
-GNUNET_TESTING_remote_start_daemon (char *gnunetd_home,
-                             char *localConfigPath,char *configFileName,char 
*remote_config_path,char *ip_address,
-                             char *username);
-                             
-int GNUNET_TESTING_remote_start_daemons(struct GNUNET_GC_Configuration 
**newcfg);
-
-
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif