[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15833 - gnunet/src/topology
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15833 - gnunet/src/topology |
Date: |
Mon, 4 Jul 2011 11:02:34 +0200 |
Author: grothoff
Date: 2011-07-04 11:02:34 +0200 (Mon, 04 Jul 2011)
New Revision: 15833
Modified:
gnunet/src/topology/test_gnunet_daemon_topology.c
gnunet/src/topology/test_gnunet_daemon_topology_data.conf
Log:
stuff
Modified: gnunet/src/topology/test_gnunet_daemon_topology.c
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology.c 2011-07-04 09:01:40 UTC
(rev 15832)
+++ gnunet/src/topology/test_gnunet_daemon_topology.c 2011-07-04 09:02:34 UTC
(rev 15833)
@@ -51,8 +51,9 @@
/**
* Check whether peers successfully shut down.
*/
-void shutdown_callback (void *cls,
- const char *emsg)
+static void
+shutdown_callback (void *cls,
+ const char *emsg)
{
if (emsg != NULL)
{
@@ -72,6 +73,7 @@
}
}
+
static void
clean_up_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -112,11 +114,12 @@
}
-static void my_cb(void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+static
+void my_cb(void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d,
+ const char *emsg)
{
GNUNET_assert (id != NULL);
peers_left--;
@@ -164,10 +167,12 @@
GNUNET_assert (pg != NULL);
}
+
static int
check ()
{
- char *const argv[] = { "test-testing",
+ char *const argv[] = {
+ "test-gnunet-daemon-topology",
"-c",
"test_gnunet_daemon_topology_data.conf",
#if VERBOSE
@@ -184,6 +189,7 @@
return ok;
}
+
int
main (int argc, char *argv[])
{
@@ -197,7 +203,6 @@
#endif
NULL);
ret = check ();
- sleep (1); /* FIXME: needed? */
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology");
return ret;
}
Modified: gnunet/src/topology/test_gnunet_daemon_topology_data.conf
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2011-07-04
09:01:40 UTC (rev 15832)
+++ gnunet/src/topology/test_gnunet_daemon_topology_data.conf 2011-07-04
09:02:34 UTC (rev 15833)
@@ -7,7 +7,7 @@
[transport]
PORT = 2665
PLUGINS = tcp
-# DEBUG = YES
+#DEBUG = YES
#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
#PREFIX = valgrind --tool=memcheck --log-file=logs%p
@@ -30,13 +30,14 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = NO
+USE_HOSTNAME = NO
[peerinfo]
PORT = 2669
[core]
PORT = 2670
-# DEBUG = YES
+#DEBUG = YES
[topology]
# DEBUG = YES
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15833 - gnunet/src/topology,
gnunet <=