[GNUnet-SVN] r8792 - in gnunet/src: core include transport

[gnunet]

Author: grothoff
Date: 2009-07-26 15:25:54 -0600 (Sun, 26 Jul 2009)
New Revision: 8792

Modified:
   gnunet/src/core/test_core_api.c
   gnunet/src/core/test_core_api_start_only.c
   gnunet/src/include/gnunet_testing_lib.h
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/test_transport_api.c
Log:
fixes

Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c     2009-07-26 21:20:11 UTC (rev 8791)
+++ gnunet/src/core/test_core_api.c     2009-07-26 21:25:54 UTC (rev 8792)
@@ -48,7 +48,7 @@
 
 struct PeerContext
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_CORE_Handle *ch;
   struct GNUNET_PeerIdentity id;   
   struct GNUNET_TRANSPORT_Handle *th;

Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c  2009-07-26 21:20:11 UTC (rev 
8791)
+++ gnunet/src/core/test_core_api_start_only.c  2009-07-26 21:25:54 UTC (rev 
8792)
@@ -45,7 +45,7 @@
 
 struct PeerContext
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_CORE_Handle *ch;
   struct GNUNET_PeerIdentity id;
 #if START_ARM

Modified: gnunet/src/include/gnunet_testing_lib.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h     2009-07-26 21:20:11 UTC (rev 
8791)
+++ gnunet/src/include/gnunet_testing_lib.h     2009-07-26 21:25:54 UTC (rev 
8792)
@@ -58,6 +58,7 @@
  *
  * @param cls closure
  * @param id identifier for the daemon, NULL on error
+ * @param cfg configuration used by this daemon
  * @param d handle for the daemon
  * @param emsg error message (NULL on success)
  */
@@ -127,7 +128,7 @@
  * @param cb_cls closure for cb
  */
 void GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
-                                       struct GNUNET_CONFIGURATION_Handle *cfg,
+                                       const struct 
GNUNET_CONFIGURATION_Handle *cfg,
                                        GNUNET_TESTING_NotifyCompletion cb,
                                        void * cb_cls);
 
@@ -150,20 +151,15 @@
                                     void *cb_cls);
 
 
-
 /**
- * Start count gnunetd processes with the same set of
- * transports and applications.  The port numbers will
- * be computed by adding delta each time (zero
- * times for the first peer).
+ * Start count gnunetd processes with the same set of transports and
+ * applications.  The port numbers (any option called "PORT") will be
+ * adjusted to ensure that no two peers running on the same system
+ * have the same port(s) in their respective configurations.
  *
  * @param sched scheduler to use 
- * @param cfg configuration to use
+ * @param cfg configuration template to use
  * @param total number of daemons to start
- * @param service_home_prefix path to use as the prefix for the home of the 
services;
- *        a number will be added for the different peers
- * @param transports which transports should all peers use
- * @param applications which applications should be used?
  * @param cb function to call on each daemon that was started
  * @param cb_cls closure for cb
  * @param cbe function to call at the end
@@ -176,11 +172,8 @@
  */
 void
 GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched,
-                                struct GNUNET_CONFIGURATION_Handle *cfg,
+                                const struct GNUNET_CONFIGURATION_Handle *cfg,
                                 unsigned int total,
-                                const char *service_home_prefix,
-                                const char *transports,
-                                const char *applications,
                                 GNUNET_TESTING_NotifyDaemonRunning cb,
                                 void *cb_cls,
                                 GNUNET_TESTING_NotifyCompletion cbe,
@@ -188,6 +181,7 @@
                                 const char *hostname,
                                 va_list va);
 
+
 /**
  * Start count gnunetd processes with the same set of
  * transports and applications.  The port numbers will

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2009-07-26 21:20:11 UTC (rev 
8791)
+++ gnunet/src/transport/plugin_transport_tcp.c 2009-07-26 21:25:54 UTC (rev 
8792)
@@ -39,7 +39,7 @@
 #include "plugin_transport.h"
 #include "transport.h"
 
-#define DEBUG_TCP GNUNET_YES
+#define DEBUG_TCP GNUNET_NO
 
 /**
  * After how long do we expire an address that we

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2009-07-26 21:20:11 UTC (rev 
8791)
+++ gnunet/src/transport/test_transport_api.c   2009-07-26 21:25:54 UTC (rev 
8792)
@@ -44,7 +44,7 @@
 
 struct PeerContext
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_PeerIdentity id;
 #if START_ARM