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

[gnunet]

Author: nevans
Date: 2008-02-06 00:22:54 -0700 (Wed, 06 Feb 2008)
New Revision: 6165

Modified:
   GNUnet/src/include/gnunet_chat_lib.h
   GNUnet/src/include/gnunet_remote_lib.h
Log:


Modified: GNUnet/src/include/gnunet_chat_lib.h
===================================================================
--- GNUnet/src/include/gnunet_chat_lib.h        2008-02-06 07:22:39 UTC (rev 
6164)
+++ GNUnet/src/include/gnunet_chat_lib.h        2008-02-06 07:22:54 UTC (rev 
6165)
@@ -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
@@ -137,17 +137,13 @@
  * @param cls argument to callback
  * @return NULL on error
  */
-struct GNUNET_CHAT_Room *GNUNET_CHAT_join_room (struct GNUNET_GE_Context
-                                                *ectx,
-                                                struct GNUNET_GC_Configuration
-                                                *cfg, const char *nickname,
-                                                const GNUNET_RSA_PublicKey *
-                                                me,
-                                                const struct
-                                                GNUNET_RSA_PrivateKey *key,
-                                                const char *memberInfo,
-                                                GNUNET_CHAT_MessageCallback
-                                                callback, void *cls);
+struct GNUNET_CHAT_Room *GNUNET_CHAT_join_room (struct GNUNET_GE_Context *ectx,
+                       struct GNUNET_GC_Configuration *cfg,
+                       const char *nickname,
+                       const GNUNET_RSA_PublicKey * me,
+                       const struct GNUNET_RSA_PrivateKey *key,
+                       const char *memberInfo,
+                       GNUNET_CHAT_MessageCallback callback, void *cls);
 
 /**
  * Leave a chat room.
@@ -224,3 +220,5 @@
 #endif
 
 #endif
+
+/* end of gnunet_chat_lib.h */

Modified: GNUnet/src/include/gnunet_remote_lib.h
===================================================================
--- GNUnet/src/include/gnunet_remote_lib.h      2008-02-06 07:22:39 UTC (rev 
6164)
+++ GNUnet/src/include/gnunet_remote_lib.h      2008-02-06 07:22:54 UTC (rev 
6165)
@@ -41,16 +41,17 @@
 /**
  * Linked list of information about daemon processes.
  */
-struct GNUNET_REMOTE_DaemonContext
+struct GNUNET_remote_host
 {
-  struct GNUNET_TESTING_DaemonContext *next;
-  GNUNET_PeerIdentity peer;
-  pid_t pid;
-  unsigned short port;
-  char *configFile;
+       GNUNET_PeerIdentity identity;
+       struct GNUNET_remote_host *next; 
+       
+       char *hostname;
+       unsigned long long controlPort;
+       pid_t pid;
+               
 };
 
-
 /**
  * Starts a single gnunet daemon on a remote machine
  *
@@ -61,8 +62,7 @@
  * @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,
+int GNUNET_REMOTE_start_daemon (char *gnunetd_home,
                              char *localConfigPath,char *configFileName,char 
*remote_config_path,char *ip_address,
                              char *username);