diff options
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | po/de.po | 16 | ||||
-rw-r--r-- | po/es.po | 16 | ||||
-rw-r--r-- | po/sv.po | 16 | ||||
-rw-r--r-- | po/vi.po | 16 | ||||
-rw-r--r-- | po/zh_CN.po | 16 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/consensus/Makefile.am | 48 | ||||
-rw-r--r-- | src/consensus/consensus.conf.in | 11 | ||||
-rw-r--r-- | src/consensus/gnunet-service-consensus.cc | 10 | ||||
-rw-r--r-- | src/testbed/gnunet-testbed-profiler.c | 9 |
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 | |||
1155 | src/chat/chat.conf | 1155 | src/chat/chat.conf |
1156 | src/core/Makefile | 1156 | src/core/Makefile |
1157 | src/core/core.conf | 1157 | src/core/core.conf |
1158 | src/consensus/Makefile | ||
1159 | src/consensus/consensus.conf | ||
1158 | src/datacache/Makefile | 1160 | src/datacache/Makefile |
1159 | src/datastore/Makefile | 1161 | src/datastore/Makefile |
1160 | src/datastore/datastore.conf | 1162 | src/datastore/datastore.conf |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: GNUnet 0.7.0b\n" | 8 | "Project-Id-Version: GNUnet 0.7.0b\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2012-11-05 22:09+0100\n" | 10 | "POT-Creation-Date: 2012-11-05 22:48+0100\n" |
11 | "PO-Revision-Date: 2006-03-17 21:37+0100\n" | 11 | "PO-Revision-Date: 2006-03-17 21:37+0100\n" |
12 | "Last-Translator: Nils Durner <durner@gnunet.org>\n" | 12 | "Last-Translator: Nils Durner <durner@gnunet.org>\n" |
13 | "Language-Team: German <de@li.org>\n" | 13 | "Language-Team: German <de@li.org>\n" |
@@ -3577,24 +3577,24 @@ msgstr "" | |||
3577 | msgid "Profiler for regex/mesh" | 3577 | msgid "Profiler for regex/mesh" |
3578 | msgstr "" | 3578 | msgstr "" |
3579 | 3579 | ||
3580 | #: src/mesh/gnunet-service-mesh.c:8033 | 3580 | #: src/mesh/gnunet-service-mesh.c:8038 |
3581 | msgid "Wrong CORE service\n" | 3581 | msgid "Wrong CORE service\n" |
3582 | msgstr "" | 3582 | msgstr "" |
3583 | 3583 | ||
3584 | #: src/mesh/gnunet-service-mesh.c:8238 | 3584 | #: src/mesh/gnunet-service-mesh.c:8243 |
3585 | #, fuzzy | 3585 | #, fuzzy |
3586 | msgid "Mesh service could not access hostkey. Exiting.\n" | 3586 | msgid "Mesh service could not access hostkey. Exiting.\n" |
3587 | msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n" | 3587 | msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n" |
3588 | 3588 | ||
3589 | #: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339 | 3589 | #: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344 |
3590 | #: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364 | 3590 | #: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369 |
3591 | #: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391 | 3591 | #: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396 |
3592 | #: src/mesh/gnunet-service-mesh.c:8403 | 3592 | #: src/mesh/gnunet-service-mesh.c:8408 |
3593 | #, fuzzy, c-format | 3593 | #, fuzzy, c-format |
3594 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" | 3594 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" |
3595 | msgstr "GNUnet Konfiguration" | 3595 | msgstr "GNUnet Konfiguration" |
3596 | 3596 | ||
3597 | #: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426 | 3597 | #: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431 |
3598 | #, fuzzy, c-format | 3598 | #, fuzzy, c-format |
3599 | msgid "" | 3599 | msgid "" |
3600 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" | 3600 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: GNUnet 0.7.0e\n" | 8 | "Project-Id-Version: GNUnet 0.7.0e\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2012-11-05 22:09+0100\n" | 10 | "POT-Creation-Date: 2012-11-05 22:48+0100\n" |
11 | "PO-Revision-Date: 2006-06-29 12:05+0200\n" | 11 | "PO-Revision-Date: 2006-06-29 12:05+0200\n" |
12 | "Last-Translator: Miguel Angel Arruga <miguel.13@telefonica.net>\n" | 12 | "Last-Translator: Miguel Angel Arruga <miguel.13@telefonica.net>\n" |
13 | "Language-Team: Spanish\n" | 13 | "Language-Team: Spanish\n" |
@@ -3563,24 +3563,24 @@ msgstr "" | |||
3563 | msgid "Profiler for regex/mesh" | 3563 | msgid "Profiler for regex/mesh" |
3564 | msgstr "" | 3564 | msgstr "" |
3565 | 3565 | ||
3566 | #: src/mesh/gnunet-service-mesh.c:8033 | 3566 | #: src/mesh/gnunet-service-mesh.c:8038 |
3567 | msgid "Wrong CORE service\n" | 3567 | msgid "Wrong CORE service\n" |
3568 | msgstr "" | 3568 | msgstr "" |
3569 | 3569 | ||
3570 | #: src/mesh/gnunet-service-mesh.c:8238 | 3570 | #: src/mesh/gnunet-service-mesh.c:8243 |
3571 | #, fuzzy | 3571 | #, fuzzy |
3572 | msgid "Mesh service could not access hostkey. Exiting.\n" | 3572 | msgid "Mesh service could not access hostkey. Exiting.\n" |
3573 | msgstr "Imposible acceder a la información del espacio.\n" | 3573 | msgstr "Imposible acceder a la información del espacio.\n" |
3574 | 3574 | ||
3575 | #: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339 | 3575 | #: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344 |
3576 | #: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364 | 3576 | #: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369 |
3577 | #: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391 | 3577 | #: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396 |
3578 | #: src/mesh/gnunet-service-mesh.c:8403 | 3578 | #: src/mesh/gnunet-service-mesh.c:8408 |
3579 | #, fuzzy, c-format | 3579 | #, fuzzy, c-format |
3580 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" | 3580 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" |
3581 | msgstr "Configuración de GNUnet" | 3581 | msgstr "Configuración de GNUnet" |
3582 | 3582 | ||
3583 | #: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426 | 3583 | #: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431 |
3584 | #, fuzzy, c-format | 3584 | #, fuzzy, c-format |
3585 | msgid "" | 3585 | msgid "" |
3586 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" | 3586 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: GNUnet 0.7.0b\n" | 8 | "Project-Id-Version: GNUnet 0.7.0b\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2012-11-05 22:09+0100\n" | 10 | "POT-Creation-Date: 2012-11-05 22:48+0100\n" |
11 | "PO-Revision-Date: 2006-01-21 17:16+0100\n" | 11 | "PO-Revision-Date: 2006-01-21 17:16+0100\n" |
12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" | 12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" |
13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" | 13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" |
@@ -3511,24 +3511,24 @@ msgstr "" | |||
3511 | msgid "Profiler for regex/mesh" | 3511 | msgid "Profiler for regex/mesh" |
3512 | msgstr "" | 3512 | msgstr "" |
3513 | 3513 | ||
3514 | #: src/mesh/gnunet-service-mesh.c:8033 | 3514 | #: src/mesh/gnunet-service-mesh.c:8038 |
3515 | msgid "Wrong CORE service\n" | 3515 | msgid "Wrong CORE service\n" |
3516 | msgstr "" | 3516 | msgstr "" |
3517 | 3517 | ||
3518 | #: src/mesh/gnunet-service-mesh.c:8238 | 3518 | #: src/mesh/gnunet-service-mesh.c:8243 |
3519 | #, fuzzy | 3519 | #, fuzzy |
3520 | msgid "Mesh service could not access hostkey. Exiting.\n" | 3520 | msgid "Mesh service could not access hostkey. Exiting.\n" |
3521 | msgstr "Kunde inte komma åt namnrymdsinformation.\n" | 3521 | msgstr "Kunde inte komma åt namnrymdsinformation.\n" |
3522 | 3522 | ||
3523 | #: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339 | 3523 | #: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344 |
3524 | #: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364 | 3524 | #: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369 |
3525 | #: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391 | 3525 | #: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396 |
3526 | #: src/mesh/gnunet-service-mesh.c:8403 | 3526 | #: src/mesh/gnunet-service-mesh.c:8408 |
3527 | #, fuzzy, c-format | 3527 | #, fuzzy, c-format |
3528 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" | 3528 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" |
3529 | msgstr "GNUnet-konfiguration" | 3529 | msgstr "GNUnet-konfiguration" |
3530 | 3530 | ||
3531 | #: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426 | 3531 | #: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431 |
3532 | #, fuzzy, c-format | 3532 | #, fuzzy, c-format |
3533 | msgid "" | 3533 | msgid "" |
3534 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" | 3534 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" |
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: gnunet 0.8.0a\n" | 9 | "Project-Id-Version: gnunet 0.8.0a\n" |
10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
11 | "POT-Creation-Date: 2012-11-05 22:09+0100\n" | 11 | "POT-Creation-Date: 2012-11-05 22:48+0100\n" |
12 | "PO-Revision-Date: 2008-09-10 22:05+0930\n" | 12 | "PO-Revision-Date: 2008-09-10 22:05+0930\n" |
13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" | 13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" |
14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" | 14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" |
@@ -3576,24 +3576,24 @@ msgstr "" | |||
3576 | msgid "Profiler for regex/mesh" | 3576 | msgid "Profiler for regex/mesh" |
3577 | msgstr "" | 3577 | msgstr "" |
3578 | 3578 | ||
3579 | #: src/mesh/gnunet-service-mesh.c:8033 | 3579 | #: src/mesh/gnunet-service-mesh.c:8038 |
3580 | msgid "Wrong CORE service\n" | 3580 | msgid "Wrong CORE service\n" |
3581 | msgstr "" | 3581 | msgstr "" |
3582 | 3582 | ||
3583 | #: src/mesh/gnunet-service-mesh.c:8238 | 3583 | #: src/mesh/gnunet-service-mesh.c:8243 |
3584 | #, fuzzy | 3584 | #, fuzzy |
3585 | msgid "Mesh service could not access hostkey. Exiting.\n" | 3585 | msgid "Mesh service could not access hostkey. Exiting.\n" |
3586 | msgstr "Không thể truy cập đến thông tin về không gian tên.\n" | 3586 | msgstr "Không thể truy cập đến thông tin về không gian tên.\n" |
3587 | 3587 | ||
3588 | #: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339 | 3588 | #: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344 |
3589 | #: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364 | 3589 | #: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369 |
3590 | #: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391 | 3590 | #: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396 |
3591 | #: src/mesh/gnunet-service-mesh.c:8403 | 3591 | #: src/mesh/gnunet-service-mesh.c:8408 |
3592 | #, fuzzy, c-format | 3592 | #, fuzzy, c-format |
3593 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" | 3593 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" |
3594 | msgstr "Lưu cấu hình ngay bây giờ không?" | 3594 | msgstr "Lưu cấu hình ngay bây giờ không?" |
3595 | 3595 | ||
3596 | #: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426 | 3596 | #: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431 |
3597 | #, fuzzy, c-format | 3597 | #, fuzzy, c-format |
3598 | msgid "" | 3598 | msgid "" |
3599 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" | 3599 | "%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 "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: gnunet-0.8.1\n" | 8 | "Project-Id-Version: gnunet-0.8.1\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2012-11-05 22:09+0100\n" | 10 | "POT-Creation-Date: 2012-11-05 22:48+0100\n" |
11 | "PO-Revision-Date: 2011-07-09 12:12+0800\n" | 11 | "PO-Revision-Date: 2011-07-09 12:12+0800\n" |
12 | "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" | 12 | "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" |
13 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" | 13 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" |
@@ -3370,24 +3370,24 @@ msgstr "" | |||
3370 | msgid "Profiler for regex/mesh" | 3370 | msgid "Profiler for regex/mesh" |
3371 | msgstr "" | 3371 | msgstr "" |
3372 | 3372 | ||
3373 | #: src/mesh/gnunet-service-mesh.c:8033 | 3373 | #: src/mesh/gnunet-service-mesh.c:8038 |
3374 | msgid "Wrong CORE service\n" | 3374 | msgid "Wrong CORE service\n" |
3375 | msgstr "" | 3375 | msgstr "" |
3376 | 3376 | ||
3377 | #: src/mesh/gnunet-service-mesh.c:8238 | 3377 | #: src/mesh/gnunet-service-mesh.c:8243 |
3378 | #, fuzzy | 3378 | #, fuzzy |
3379 | msgid "Mesh service could not access hostkey. Exiting.\n" | 3379 | msgid "Mesh service could not access hostkey. Exiting.\n" |
3380 | msgstr "找不到接口“%s”的一个 IP 地址。\n" | 3380 | msgstr "找不到接口“%s”的一个 IP 地址。\n" |
3381 | 3381 | ||
3382 | #: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339 | 3382 | #: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344 |
3383 | #: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364 | 3383 | #: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369 |
3384 | #: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391 | 3384 | #: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396 |
3385 | #: src/mesh/gnunet-service-mesh.c:8403 | 3385 | #: src/mesh/gnunet-service-mesh.c:8408 |
3386 | #, fuzzy, c-format | 3386 | #, fuzzy, c-format |
3387 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" | 3387 | msgid "%s service is lacking key configuration settings (%s). Exiting.\n" |
3388 | msgstr "立即保存配置?" | 3388 | msgstr "立即保存配置?" |
3389 | 3389 | ||
3390 | #: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426 | 3390 | #: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431 |
3391 | #, fuzzy, c-format | 3391 | #, fuzzy, c-format |
3392 | msgid "" | 3392 | msgid "" |
3393 | "%s service is lacking key configuration settings (%s). Using default (%u).\n" | 3393 | "%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 @@ | |||
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | if HAVE_EXPERIMENTAL | 5 | if HAVE_EXPERIMENTAL |
6 | EXP_DIR = chat dv | 6 | EXP_DIR = chat dv consensus |
7 | endif | 7 | endif |
8 | 8 | ||
9 | if LINUX | 9 | 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 @@ | |||
1 | INCLUDES = -I$(top_srcdir)/src/include | ||
2 | |||
3 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
4 | |||
5 | libexecdir= $(pkglibdir)/libexec/ | ||
6 | |||
7 | pkgcfg_DATA = \ | ||
8 | consensus.conf | ||
9 | |||
10 | if MINGW | ||
11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
12 | endif | ||
13 | |||
14 | if USE_COVERAGE | ||
15 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | ||
16 | endif | ||
17 | |||
18 | #bin_PROGRAMS = \ | ||
19 | # gnunet-consensus | ||
20 | |||
21 | libexec_PROGRAMS = \ | ||
22 | gnunet-service-consensus | ||
23 | |||
24 | #gnunet_consensus_SOURCES = \ | ||
25 | # gnunet-consensus.c | ||
26 | #gnunet_consensus_LDADD = \ | ||
27 | # $(top_builddir)/src/util/libgnunetutil.la \ | ||
28 | # $(GN_LIBINTL) | ||
29 | |||
30 | gnunet_service_consensus_SOURCES = \ | ||
31 | gnunet-service-consensus.cc | ||
32 | gnunet_service_consensus_LDADD = \ | ||
33 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
34 | $(GN_LIBINTL) | ||
35 | |||
36 | |||
37 | #check_PROGRAMS = \ | ||
38 | # test_consensus_api | ||
39 | |||
40 | #if ENABLE_TEST_RUN | ||
41 | #TESTS = $(check_PROGRAMS) | ||
42 | #endif | ||
43 | # | ||
44 | #test_consensus_api_SOURCES = \ | ||
45 | # test_consensus_api.c | ||
46 | #test_consensus_api_LDADD = \ | ||
47 | # $(top_builddir)/src/util/libgnunetutil.la | ||
48 | |||
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 @@ | |||
1 | [consensus] | ||
2 | AUTOSTART = YES | ||
3 | @UNIXONLY@ PORT = 2103 | ||
4 | HOSTNAME = localhost | ||
5 | HOME = $SERVICEHOME | ||
6 | BINARY = gnunet-service-consensus | ||
7 | ACCEPT_FROM = 127.0.0.1; | ||
8 | ACCEPT_FROM6 = ::1; | ||
9 | UNIXPATH = /tmp/gnunet-service-consensus.sock | ||
10 | UNIX_MATCH_UID = YES | ||
11 | 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 @@ | |||
1 | #include <cstdio> | ||
2 | #include <iostream> | ||
3 | |||
4 | using namespace std; | ||
5 | |||
6 | int main () | ||
7 | { | ||
8 | cout << "Hello world" << endl; | ||
9 | return 0; | ||
10 | } | ||
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) | |||
297 | } | 297 | } |
298 | 298 | ||
299 | 299 | ||
300 | |||
301 | |||
302 | |||
303 | /** | 300 | /** |
304 | * Functions of this signature are called when a peer has been successfully | 301 | * Functions of this signature are called when a peer has been successfully |
305 | * started or stopped. | 302 | * started or stopped. |
@@ -335,7 +332,9 @@ peer_churn_cb (void *cls, const char *emsg) | |||
335 | fflush (stdout); | 332 | fflush (stdout); |
336 | result = GNUNET_OK; | 333 | result = GNUNET_OK; |
337 | if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI)) | 334 | if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI)) |
338 | { | 335 | { |
336 | fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n"); | ||
337 | (void) getc (stdin); | ||
339 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 338 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
340 | return; | 339 | return; |
341 | } | 340 | } |
@@ -562,6 +561,8 @@ controller_event_cb (void *cls, | |||
562 | { | 561 | { |
563 | print_overlay_links_summary (); | 562 | print_overlay_links_summary (); |
564 | result = GNUNET_OK; | 563 | result = GNUNET_OK; |
564 | fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n"); | ||
565 | (void) getc (stdin); | ||
565 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 566 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
566 | } | 567 | } |
567 | break; | 568 | break; |