[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22352 - in gnunet/src: peerinfo testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22352 - in gnunet/src: peerinfo testing |
Date: |
Wed, 27 Jun 2012 17:34:07 +0200 |
Author: dold
Date: 2012-06-27 17:34:07 +0200 (Wed, 27 Jun 2012)
New Revision: 22352
Modified:
gnunet/src/peerinfo/peerinfo.conf.in
gnunet/src/testing/gnunet-testing-run-service.c
Log:
added JAVAPORT to peerinfo config, fix in gnunet-testing-run-service.c
Modified: gnunet/src/peerinfo/peerinfo.conf.in
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf.in 2012-06-27 15:30:56 UTC (rev
22351)
+++ gnunet/src/peerinfo/peerinfo.conf.in 2012-06-27 15:34:07 UTC (rev
22352)
@@ -1,6 +1,6 @@
[peerinfo]
AUTOSTART = YES
address@hidden@ PORT = 2090
address@hidden@PORT = 2090
HOSTNAME = localhost
HOME = $SERVICEHOME
CONFIG = $DEFAULTCONFIG
Modified: gnunet/src/testing/gnunet-testing-run-service.c
===================================================================
--- gnunet/src/testing/gnunet-testing-run-service.c 2012-06-27 15:30:56 UTC
(rev 22351)
+++ gnunet/src/testing/gnunet-testing-run-service.c 2012-06-27 15:34:07 UTC
(rev 22352)
@@ -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 @@
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 @@
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 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22352 - in gnunet/src: peerinfo testing,
gnunet <=