From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Jun 2012 15:34:07 +0000 (+0000)
Subject: added JAVAPORT to peerinfo config, fix in gnunet-testing-run-service.c
X-Git-Tag: initial-import-from-subversion-38251~12768
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=039c0a8e1c193c692c4f492d75cc2b98643203ef;p=oweals%2Fgnunet.git

added JAVAPORT to peerinfo config, fix in gnunet-testing-run-service.c
---

diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index a40cc4fba..c45a05262 100644
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -1,6 +1,6 @@
 [peerinfo]
 AUTOSTART = YES
-@UNIXONLY@ PORT = 2090
+@JAVAPORT@PORT = 2090
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG
diff --git a/src/testing/gnunet-testing-run-service.c b/src/testing/gnunet-testing-run-service.c
index cbd4763c5..988b67e4f 100644
--- a/src/testing/gnunet-testing-run-service.c
+++ b/src/testing/gnunet-testing-run-service.c
@@ -28,8 +28,8 @@
  * Outputs the path to the temporary configuration file to stdout.
  *
  * The peer will run until this program is killed,
- * or stdin is closed. When reading the character 'r' from stdin, the running service is
- * restarted with the same configuration.
+ * or stdin is closed. When reading the character 'r' from stdin,
+ * the running service is restarted with the same configuration.
  *
  * This executable is intended to be used by gnunet-java, in order to reliably
  * start and stop services for test cases.
@@ -43,7 +43,7 @@
 
 
 /**
- * FIXME
+ * File handle to STDIN, for reading restart/quit commands.
  */
 static struct GNUNET_DISK_FileHandle *fh;
 
@@ -129,7 +129,8 @@ stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     fprintf (stderr, _("Unknown command, use 'q' to quit or 'r' to restart peer\n"));
     break;
   }
-  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh, &stdin_cb, NULL);    
+  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
+                                        &stdin_cb, NULL);    
 }
 
 
@@ -153,16 +154,18 @@ testing_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
     return;
   }
   if (GNUNET_SYSERR == 
-      GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg, tmpfilename))
+      GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg,
+                                  tmpfilename))
   {
     GNUNET_break (0);
     return;
   }
-  printf("%s\n", tmpfilename);
+  printf("ok\n%s\n", tmpfilename);
   fflush(stdout);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, NULL);
   fh = GNUNET_DISK_get_handle_from_native (stdin);
-  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh, &stdin_cb, NULL);
+  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, fh,
+                                        &stdin_cb, NULL);
 }
 
 
@@ -180,7 +183,7 @@ main (int argc, char *const *argv)
   static char *srv_name;
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     {'c', "config", "FILENAME",
-     gettext_noop ("name of the configuration file to use"), 1,
+     gettext_noop ("name of the template configuration file to use (optional)"), 1,
      &GNUNET_GETOPT_set_string, &cfg_name},
     {'s', "service", "SERVICE",
      gettext_noop ("name of the service to run"), 1,