summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--po/de.po16
-rw-r--r--po/es.po16
-rw-r--r--po/sv.po16
-rw-r--r--po/vi.po16
-rw-r--r--po/zh_CN.po16
-rw-r--r--src/Makefile.am2
-rw-r--r--src/consensus/Makefile.am48
-rw-r--r--src/consensus/consensus.conf.in11
-rw-r--r--src/consensus/gnunet-service-consensus.cc10
-rw-r--r--src/testbed/gnunet-testbed-profiler.c9
11 files changed, 117 insertions, 45 deletions
diff --git a/configure.ac b/configure.ac
index 3ab772d6a..6d7790313 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1155,6 +1155,8 @@ src/chat/Makefile
src/chat/chat.conf
src/core/Makefile
src/core/core.conf
+src/consensus/Makefile
+src/consensus/consensus.conf
src/datacache/Makefile
src/datastore/Makefile
src/datastore/datastore.conf
diff --git a/po/de.po b/po/de.po
index aad2c2b8c..a740f3ecd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
"PO-Revision-Date: 2006-03-17 21:37+0100\n"
"Last-Translator: Nils Durner <durner@gnunet.org>\n"
"Language-Team: German <de@li.org>\n"
@@ -3577,24 +3577,24 @@ msgstr ""
msgid "Profiler for regex/mesh"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
#, fuzzy
msgid "Mesh service could not access hostkey. Exiting.\n"
msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
#, fuzzy, c-format
msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
msgstr "GNUnet Konfiguration"
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
#, fuzzy, c-format
msgid ""
"%s service is lacking key configuration settings (%s). Using default (%u).\n"
diff --git a/po/es.po b/po/es.po
index 7d1749ad1..b198712e3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0e\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
"PO-Revision-Date: 2006-06-29 12:05+0200\n"
"Last-Translator: Miguel Angel Arruga <miguel.13@telefonica.net>\n"
"Language-Team: Spanish\n"
@@ -3563,24 +3563,24 @@ msgstr ""
msgid "Profiler for regex/mesh"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
#, fuzzy
msgid "Mesh service could not access hostkey. Exiting.\n"
msgstr "Imposible acceder a la información del espacio.\n"
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
#, fuzzy, c-format
msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
msgstr "Configuración de GNUnet"
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
#, fuzzy, c-format
msgid ""
"%s service is lacking key configuration settings (%s). Using default (%u).\n"
diff --git a/po/sv.po b/po/sv.po
index 0d9c2f261..97a621585 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -3511,24 +3511,24 @@ msgstr ""
msgid "Profiler for regex/mesh"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
#, fuzzy
msgid "Mesh service could not access hostkey. Exiting.\n"
msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
#, fuzzy, c-format
msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
msgstr "GNUnet-konfiguration"
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
#, fuzzy, c-format
msgid ""
"%s service is lacking key configuration settings (%s). Using default (%u).\n"
diff --git a/po/vi.po b/po/vi.po
index a39c84809..0927b72e4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet 0.8.0a\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
"PO-Revision-Date: 2008-09-10 22:05+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -3576,24 +3576,24 @@ msgstr ""
msgid "Profiler for regex/mesh"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
#, fuzzy
msgid "Mesh service could not access hostkey. Exiting.\n"
msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
#, fuzzy, c-format
msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
msgstr "Lưu cấu hình ngay bây giờ không?"
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
#, fuzzy, c-format
msgid ""
"%s service is lacking key configuration settings (%s). Using default (%u).\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b5b97d646..245743ddd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet-0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
"PO-Revision-Date: 2011-07-09 12:12+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -3370,24 +3370,24 @@ msgstr ""
msgid "Profiler for regex/mesh"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
#, fuzzy
msgid "Mesh service could not access hostkey. Exiting.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
#, fuzzy, c-format
msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
msgstr "立即保存配置?"
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
#, fuzzy, c-format
msgid ""
"%s service is lacking key configuration settings (%s). Using default (%u).\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 503b25a45..08b93efb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
#endif
if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv
+ EXP_DIR = chat dv consensus
endif
if LINUX
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
new file mode 100644
index 000000000..2041ec1ac
--- /dev/null
+++ b/src/consensus/Makefile.am
@@ -0,0 +1,48 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+ consensus.conf
+
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+endif
+
+if USE_COVERAGE
+ AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+#bin_PROGRAMS = \
+# gnunet-consensus
+
+libexec_PROGRAMS = \
+ gnunet-service-consensus
+
+#gnunet_consensus_SOURCES = \
+# gnunet-consensus.c
+#gnunet_consensus_LDADD = \
+# $(top_builddir)/src/util/libgnunetutil.la \
+# $(GN_LIBINTL)
+
+gnunet_service_consensus_SOURCES = \
+ gnunet-service-consensus.cc
+gnunet_service_consensus_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+
+#check_PROGRAMS = \
+# test_consensus_api
+
+#if ENABLE_TEST_RUN
+#TESTS = $(check_PROGRAMS)
+#endif
+#
+#test_consensus_api_SOURCES = \
+# test_consensus_api.c
+#test_consensus_api_LDADD = \
+# $(top_builddir)/src/util/libgnunetutil.la
+
diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in
new file mode 100644
index 000000000..18e976deb
--- /dev/null
+++ b/src/consensus/consensus.conf.in
@@ -0,0 +1,11 @@
+[consensus]
+AUTOSTART = YES
+@UNIXONLY@ PORT = 2103
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+BINARY = gnunet-service-consensus
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-consensus.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
diff --git a/src/consensus/gnunet-service-consensus.cc b/src/consensus/gnunet-service-consensus.cc
new file mode 100644
index 000000000..d5e829e51
--- /dev/null
+++ b/src/consensus/gnunet-service-consensus.cc
@@ -0,0 +1,10 @@
+#include <cstdio>
+#include <iostream>
+
+using namespace std;
+
+int main ()
+{
+ cout << "Hello world" << endl;
+ return 0;
+}
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 99efa6741..9bfeaddd2 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -297,9 +297,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
}
-
-
-
/**
* Functions of this signature are called when a peer has been successfully
* started or stopped.
@@ -335,7 +332,9 @@ peer_churn_cb (void *cls, const char *emsg)
fflush (stdout);
result = GNUNET_OK;
if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI))
- {
+ {
+ fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n");
+ (void) getc (stdin);
shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
@@ -562,6 +561,8 @@ controller_event_cb (void *cls,
{
print_overlay_links_summary ();
result = GNUNET_OK;
+ fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n");
+ (void) getc (stdin);
shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
break;