[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (47409fa1f -> 83fbbaeff)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (47409fa1f -> 83fbbaeff) |
|
Date: |
Wed, 27 Dec 2023 21:45:25 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a change to branch master
in repository gnunet.
from 47409fa1f GNS: Fix openssl.cnf for GNS proxy and meson install of
files.
new 0c1e695a9 CONVERSATION: fix meson gstreamer detection and compile
new 53d16b539 CONVERSATION: Include test binary in build (meson)
new e02bdeed6 meson: Cleanup build, also remove deprecated testbed and
peerinfo references.
new 83fbbaeff meson: simplify dist script
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
doc/man/Makefile.am | 3 -
doc/man/gnunet-ats.1 | 114 --
doc/man/gnunet-peerinfo.1 | 99 --
doc/man/gnunet-testbed-profiler.1 | 89 --
doc/man/meson.build | 3 -
meson-dist-script | 13 +-
meson.build | 73 +-
src/contrib/cli/template/meson.build | 3 +-
src/contrib/service/conversation/meson.build | 23 +-
src/contrib/service/template/meson.build | 6 +-
src/include/Makefile.am | 1 -
src/include/gnunet_peerinfo_service.h | 214 ----
src/include/gnunet_testbed_logger_service.h | 139 ---
src/include/gnunet_testbed_service.h | 1735 --------------------------
src/include/meson.build | 3 -
src/service/core/meson.build | 3 +-
src/service/dns/meson.build | 7 +-
17 files changed, 75 insertions(+), 2453 deletions(-)
delete mode 100644 doc/man/gnunet-ats.1
delete mode 100644 doc/man/gnunet-peerinfo.1
delete mode 100644 doc/man/gnunet-testbed-profiler.1
delete mode 100644 src/include/gnunet_peerinfo_service.h
delete mode 100644 src/include/gnunet_testbed_logger_service.h
delete mode 100644 src/include/gnunet_testbed_service.h
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 2dc433f49..6ab720826 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -38,7 +38,6 @@ endif
man_MANS = \
gnunet.conf.5 \
gnunet-arm.1 \
- gnunet-ats.1 \
gnunet-auto-share.1 \
gnunet-base32.1 \
gnunet-bcd.1 \
@@ -72,7 +71,6 @@ man_MANS = \
gnunet-nat-auto.1 \
gnunet-nat-server.1 \
gnunet-nse.1 \
- gnunet-peerinfo.1 \
gnunet-publish.1 \
gnunet-qr.1 \
gnunet-reclaim.1 \
@@ -82,7 +80,6 @@ man_MANS = \
gnunet-scrypt.1 \
gnunet-search.1 \
gnunet-statistics.1 \
- gnunet-testbed-profiler.1 \
gnunet-testing.1 \
gnunet-testing-run-service.1 \
gnunet-timeout.1 \
diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
deleted file mode 100644
index 311501002..000000000
--- a/doc/man/gnunet-ats.1
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
-.\"
-.\" Permission is granted to copy, distribute and/or modify this document
-.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.\" any later version published by the Free Software Foundation; with no
-.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A
-.\" copy of the license is included in the file
-.\" FDL-1.3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
-.\"
-.\" Alternately, this document is also available under the General
-.\" Public License, version 3 or later, as published by the Free Software
-.\" Foundation. A copy of the license is included in the file
-.\" GPL3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
-.\"
-.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
-.\"
-.Dd October 16, 2015
-.Dt GNUNET-ATS 1
-.Os
-.Sh NAME
-.Nm gnunet-ats
-.Nd display information about transport resource allocation
-.Sh SYNOPSIS
-.Nm
-.Op Fl a | -all
-.Op Fl C Ar PEERID | Fl -connect= Ns Ar PEERID
-.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-.Op Fl h | -help
-.Op Fl i Ar PEERID | Fl -id= Ns Ar PEERID
-.Op Fl k Ar VALUE | Fl -value= Ns Ar VALUE
-.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-.Op Fl m | -monitor
-.Op Fl n | -numeric
-.Op Fl p Ar PREFERENCE | Fl -preference= Ns Ar PREFERENCE
-.Op Fl q | -quotas
-.Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE
-.Op Fl u | -used
-.Op Fl V | -verbose
-.Op Fl v | -version
-.Sh DESCRIPTION
-.Nm
-can be used to display information about the
-GNUnet's transport selection mechanism.
-It shows information about the addresses and
-the assigned input and output bandwidth.
-.Sh OPTIONS
-.Bl -tag -width indent
-.It Fl a | -all
-List all addresses currently known to ats.
-.It Fl C Ar PEERID | Fl -connect= Ns Ar PEERID
-Ask ATS to suggest an address for PEERID to transport
-to establish a connection.
-Note that you can use the
-.Xr gnunet-transport 1
-commandline tool to force disconnects.
-.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-Use the configuration file FILENAME.
-.It Fl h | -help
-Print short help on options.
-.It Fl i Ar PEERID | Fl -id= Ns Ar PEERID
-Print information for a specific peer identity only.
-.It Fl k Ar VALUE | Fl -value= Ns Ar VALUE
-Value to set for when changing preference values.
-.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-Use LOGLEVEL for logging.
-Valid values are DEBUG, INFO, WARNING and ERROR.
-.It Fl m | -monitor
-Monitor changes to the bandwidth assignments continuously.
-.It Fl n | -numeric
-Do not resolve IP addresses to hostnames.
-.It Fl p Ar PREFERENCE | Fl -preference= Ns Ar PREFERENCE
-Set preference values, -i, -k and -t required.
-.It Fl q | -quotas
-Print quotas for all network types
-.It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
-Preference type to change: latency | bandwidth
-.It Fl u | -used
-Print addresses actively used only
-.It Fl V | -verbose
-Print verbose output (include ATS address properties)
-.It v | -version
-Print GNUnet version number.
-.El
-.Sh SEE ALSO
-.Xr gnunet-transport 1
-.sp
-The full documentation for gnunet is maintained as a Texinfo manual.
-If the
-.Xr info 1
-and gnunet programs are properly installed at your site, the command
-.Pp
-.Dl info gnunet
-.Pp
-should give you access to the complete handbook,
-.Pp
-.Dl info gnunet-c-tutorial
-.Pp
-will give you access to a tutorial for developers.
-.Pp
-Depending on your installation, this information is also available in
-.Xr gnunet 7 and
-.Xr gnunet-c-tutorial 7 .
-.Sh BUGS
-Report bugs by using
-.Lk https://bugs.gnunet.org
-or by sending electronic mail to
-.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1
deleted file mode 100644
index 94951af86..000000000
--- a/doc/man/gnunet-peerinfo.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
-.\"
-.\" Permission is granted to copy, distribute and/or modify this document
-.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.\" any later version published by the Free Software Foundation; with no
-.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A
-.\" copy of the license is included in the file
-.\" FDL-1.3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
-.\"
-.\" Alternately, this document is also available under the General
-.\" Public License, version 3 or later, as published by the Free Software
-.\" Foundation. A copy of the license is included in the file
-.\" GPL3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
-.\"
-.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
-.\"
-.Dd March 4, 2013
-.Dt GNUNET-PEERINFO 1
-.Os
-.Sh NAME
-.Nm gnunet-peerinfo
-.Nd display information about other peers
-.Sh SYNOPSIS
-.Nm
-.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-.Op Fl g | -get-hello
-.Op Fl h | -help
-.Op Fl i | -info
-.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-.Op Fl l Ar LOGFILE | Fl -logfile= ns Ar LOGFILE
-.Op Fl n | -numeric
-.Op Fl p Ar HELLO | Fl -put-hello= Ns Ar HELLO
-.Op Fl q | -quiet
-.Op Fl s | -self
-.Op Fl v | -version
-.Sh DESCRIPTION
-.Nm
-displays the known addresses and trust of known peers.
-.Bl -tag -width indent
-.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-Load config file, default FILENAME of the config is
-.Pa ~/.config/gnunet.conf .
-.It Fl g | -get-hello
-Output HELLO uri(s)
-.It Fl h | -help
-Print the help page.
-.It Fl i | -info
-List all known peers (and their addresses).
-.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-Set the loglevel
-.It Fl l Ar LOGFILE | Fl -logfile= ns Ar LOGFILE
-Log messages to LOGFILE
-.It Fl n | -numeric
-Disable resolution of IPs to hostnames
-.It Fl p Ar HELLO | Fl -put-hello= Ns Ar HELLO
-Add given HELLO uri to the database
-.It Fl q | -quiet
-Do not print anything but the peer identities
-.It Fl s | -self
-Print only our own identity.
-Together with
-.Fl q ,
-this is the exact line that other peers would have to put in to their friends
file in order to consider this peer one of their friends in F2F mode.
-.It Fl v | -version
-Print the version number
-.El
-.Sh SEE ALSO
-.Xr gnunet.conf 5
-.sp
-The full documentation for gnunet is maintained as a Texinfo manual.
-If the
-.Xr info 1
-and gnunet programs are properly installed at your site, the command
-.Pp
-.Dl info gnunet
-.Pp
-should give you access to the complete handbook,
-.Pp
-.Dl info gnunet-c-tutorial
-.Pp
-will give you access to a tutorial for developers.
-.sp
-Depending on your installation, this information is also available in
-.Xr gnunet 7 and
-.Xr gnunet-c-tutorial 7 .
-.\".Sh HISTORY
-.\".Sh AUTHORS
-.Sh BUGS
-Report bugs by using
-.Lk https://bugs.gnunet.org
-or by sending electronic mail to
-.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testbed-profiler.1
b/doc/man/gnunet-testbed-profiler.1
deleted file mode 100644
index d079609ad..000000000
--- a/doc/man/gnunet-testbed-profiler.1
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
-.\"
-.\" Permission is granted to copy, distribute and/or modify this document
-.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.\" any later version published by the Free Software Foundation; with no
-.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A
-.\" copy of the license is included in the file
-.\" FDL-1.3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
-.\"
-.\" Alternately, this document is also available under the General
-.\" Public License, version 3 or later, as published by the Free Software
-.\" Foundation. A copy of the license is included in the file
-.\" GPL3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
-.\"
-.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
-.\"
-.Dd September 13, 2014
-.Dt GNUNET-TESTBED-PROFILER 1
-.Os
-.Sh NAME
-.Nm gnunet-testbed-profiler
-.Nd profiling driver for the testbed
-.Sh SYNOPSIS
-.Nm
-.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-.Op Fl e Ar COUNT | Fl -num-errors= Ns Ar COUNT
-.Op Fl H Ar FILENAME | Fl -hosts= Ns Ar FILENAME
-.Op Fl h | -help
-.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
-.Op Fl n | -non-interactive
-.Op Fl p Ar COUNT | Fl -num-peers= Ns Ar COUNT
-.Op Fl v | -version
-.Sh DESCRIPTION
-.Nm
-is a command line profiling driver for the testbed.
-.Sh OPTIONS
-.Bl -tag -width indent
-.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-Use the configuration file FILENAME.
-.It Fl e Ar COUNT | Fl -num-errors= Ns Ar COUNT
-Tolerate COUNT number of continuous timeout failures.
-.It Fl H Ar FILENAME | Fl -hosts= Ns Ar FILENAME
-Name of the file with the login information for the testbed.
-.It Fl h | -help
-Print short help on options.
-.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-Use LOGLEVEL for logging.
-Valid values are DEBUG, INFO, WARNING and ERROR.
-.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
-Configure logging to write logs to LOGFILE.
-.It Fl n | -non-interactive
-Run profiler in non-interactive mode where upon testbed setup the profiler
does not wait for a keystroke but continues to run until a termination signal
is received.
-.It Fl p Ar COUNT | Fl -num-peers= Ns Ar COUNT
-Create COUNT number of peers.
-.It Fl v | -version
-Print GNUnet version number.
-.El
-.Sh SEE ALSO
-The full documentation for gnunet is maintained as a Texinfo manual.
-If the
-.Xr info 1
-and gnunet programs are properly installed at your site, the command
-.Pp
-.Dl info gnunet
-.Pp
-should give you access to the complete handbook,
-.Pp
-.Dl info gnunet-c-tutorial
-.Pp
-will give you access to a tutorial for developers.
-.sp
-Depending on your installation, this information is also available in
-.Xr gnunet 7 and
-.Xr gnunet-c-tutorial 7 .
-.\".Sh HISTORY
-.\".Sh AUTHORS
-.Sh BUGS
-Report bugs by using
-.Lk https://bugs.gnunet.org
-or by sending electronic mail to
-.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/meson.build b/doc/man/meson.build
index 74679053f..fbd8179ba 100644
--- a/doc/man/meson.build
+++ b/doc/man/meson.build
@@ -8,7 +8,6 @@ install_man(
[
five,
'gnunet-arm.1',
- 'gnunet-ats.1',
'gnunet-auto-share.1',
'gnunet-base32.1',
'gnunet-bcd.1',
@@ -42,7 +41,6 @@ install_man(
'gnunet-nat-auto.1',
'gnunet-nat-server.1',
'gnunet-nse.1',
- 'gnunet-peerinfo.1',
'gnunet-publish.1',
'gnunet-qr.1',
'gnunet-reclaim.1',
@@ -52,7 +50,6 @@ install_man(
'gnunet-scrypt.1',
'gnunet-search.1',
'gnunet-statistics.1',
- 'gnunet-testbed-profiler.1',
'gnunet-testing.1',
'gnunet-testing-run-service.1',
'gnunet-timeout.1',
diff --git a/meson-dist-script b/meson-dist-script
index e5e9287dc..5d5cf9942 100644
--- a/meson-dist-script
+++ b/meson-dist-script
@@ -2,5 +2,14 @@
set -eu
-cd "${MESON_DIST_ROOT}"
-. ./scripts/sphinx_update.sh
+HANDBOOK_BOOTSTRAP=${MESON_SOURCE_ROOT}/contrib/handbook/_build
+
+if [ ! -d ${HANDBOOK_BOOTSTRAP}/html ] || [ ! -d ${HANDBOOK_BOOTSTRAP}/texinfo
]
+then
+ echo "Handbook not found, did you run bootstrap? Trying to compile now..."
+ cd "${MESON_DIST_ROOT}"
+ . ./scripts/sphinx_update.sh || exit 1
+else
+ cp -r ${HANDBOOK_BOOTSTRAP}/html ${MESON_DIST_ROOT}/handbook/ || exit 1
+ cp -r ${HANDBOOK_BOOTSTRAP}/texinfo ${MESON_DIST_ROOT}/handbook/ || exit 1
+fi
diff --git a/meson.build b/meson.build
index 54250ce8f..ed0ba4159 100644
--- a/meson.build
+++ b/meson.build
@@ -322,19 +322,26 @@ if ogg_dep.found()
add_project_arguments('-DHAVE_OGG', language : 'c')
endif
-gst_dep = dependency('libgst', required : false)
-if not gst_dep.found()
- gst_dep = cc.find_library('gstreamer', required : false)
-endif
-if gst_dep.found()
- add_project_arguments('-DHAVE_GST', language : 'c')
-endif
-
conversation_backend = 'none'
if pulse_dep.found() and opus_dep.found() and ogg_dep.found()
conversation_backend = 'pulse'
-elif gst_dep.found()
- conversation_backend = 'gst'
+else
+ gst_dep = dependency('gstreamer-1.0', required : false)
+ if not gst_dep.found()
+ gst_dep = cc.find_library('gstreamer-1.0', required : false)
+ endif
+ gst_app_dep = dependency('gstreamer-app-1.0', required : false)
+ if not gst_app_dep.found()
+ gst_app_dep = cc.find_library('gstreamer-app-1.0', required : false)
+ endif
+ gst_audio_dep = dependency('gstreamer-audio-1.0', required : false)
+ if not gst_audio_dep.found()
+ gst_audio_dep = cc.find_library('gstreamer-audio-1.0', required : false)
+ endif
+ if gst_dep.found() and gst_app_dep.found() and gst_audio_dep.found()
+ add_project_arguments('-DHAVE_GST', language : 'c')
+ conversation_backend = 'gst'
+ endif
endif
## END conversation
@@ -392,10 +399,10 @@ endif
# GNUTLS DANE
if cc.check_header('gnutls/dane.h')
if cc.has_function('dane_verify_crt_raw',
- prefix: '#include <gnutls/dane.h>',
- dependencies: gnutls_dep)
- add_project_arguments('-DHAVE_GNUTLS_DANE', language : 'c')
- endif
+ prefix: '#include <gnutls/dane.h>',
+ dependencies: gnutls_dep)
+ add_project_arguments('-DHAVE_GNUTLS_DANE', language : 'c')
+endif
endif
curl_ssl_check ='''#include <curl/curl.h>
int main(int argc, char **argv) {
@@ -404,7 +411,7 @@ curl_ssl_check ='''#include <curl/curl.h>
'''
result = cc.run(curl_ssl_check, name : 'cURL gnutls check',
- dependencies: curl_dep)
+ dependencies: curl_dep)
cdata.set('curl_gnutls', 0)
if result.returncode() == 0
cdata.set('curl_gnutls', 1)
@@ -459,27 +466,27 @@ add_test_setup('default', env:
['GNUNET_PREFIX='+gnunet_prefix], exclude_suites:
add_test_setup('full', env: ['GNUNET_PREFIX='+gnunet_prefix], is_default:
false)
summary({'host': host_machine.system(),
- 'prefix': get_option('prefix'),
- 'compiler': cc.get_id(),
- 'libdir': get_option('libdir'),
- 'datadir': get_option('datadir'),
- 'default interface': cdata.get('GNUNET_DEFAULT_INTERFACE'),
- 'PostgreSQL': pq_dep.found(),
- 'curl w/ gnutls': (cdata.get('curl_gnutls') == 1),
- 'ifconfig': ifconfig_bin.found(),
- 'iptables': iptables_bin.found()
- }, section: 'Detected system')
+ 'prefix': get_option('prefix'),
+ 'compiler': cc.get_id(),
+ 'libdir': get_option('libdir'),
+ 'datadir': get_option('datadir'),
+ 'default interface': cdata.get('GNUNET_DEFAULT_INTERFACE'),
+ 'PostgreSQL': pq_dep.found(),
+ 'curl w/ gnutls': (cdata.get('curl_gnutls') == 1),
+ 'ifconfig': ifconfig_bin.found(),
+ 'iptables': iptables_bin.found()
+ }, section: 'Detected system')
if not gnunet_user
message('Please make sure NOW to create a user and group \'gnunet\' and
additionally a group \'gnunetdns\'. Make sure that \'/var/lib/gnunet\' is owned
(and writable) by user \'gnunet\'')
message('Each user of GNUnet should be added to the \'gnunet\' group')
if adduser_bin.found() and not gnunet_user
message('''Create the gnunet user and add users to the gnunetdns group,
run:
- # addgroup gnunetdns
- # adduser --system --disabled-login --home /var/lib/gnunet gnunet''')
- message('''To add users to the gnunet group, run:
- # adduser USERNAME gnunet
- for each of your users, replacing \'USERNAME\' with the respective login
name.
- Users may have to login again for the changes to take effect.''')
- endif
-endif
+ # addgroup gnunetdns
+ # adduser --system --disabled-login --home /var/lib/gnunet gnunet''')
+ message('''To add users to the gnunet group, run:
+ # adduser USERNAME gnunet
+ for each of your users, replacing \'USERNAME\' with the respective
login name.
+ Users may have to login again for the changes to take effect.''')
+ endif
+ endif
diff --git a/src/contrib/cli/template/meson.build
b/src/contrib/cli/template/meson.build
index f5adc97b3..dba66a8f2 100644
--- a/src/contrib/cli/template/meson.build
+++ b/src/contrib/cli/template/meson.build
@@ -2,5 +2,4 @@ executable ('gnunet-template',
['gnunet-template.c'],
dependencies: [libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('bindir'))
+ install: false)
diff --git a/src/contrib/service/conversation/meson.build
b/src/contrib/service/conversation/meson.build
index 052fa1a6e..4ecc0fc93 100644
--- a/src/contrib/service/conversation/meson.build
+++ b/src/contrib/service/conversation/meson.build
@@ -82,6 +82,16 @@ executable ('gnunet-conversation',
install: true,
install_dir: get_option('bindir'))
+executable ('gnunet-conversation-test',
+ 'gnunet-conversation-test.c',
+ dependencies: [libgnunetconversation_dep,
+ libgnunetspeaker_dep,
+ libgnunetmicrophone_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+
executable ('gnunet-service-conversation',
gnunetserviceconversation_src,
dependencies: [libgnunetconversation_dep,
@@ -108,6 +118,8 @@ executable ('gnunet-helper-audio-record',
libgnunetspeaker_dep,
libgnunetmicrophone_dep,
gst_dep,
+ gst_app_dep,
+ gst_audio_dep,
ogg_dep,
pulse_dep,
opus_dep
@@ -123,6 +135,8 @@ executable ('gnunet-helper-audio-playback',
libgnunetspeaker_dep,
libgnunetmicrophone_dep,
gst_dep,
+ gst_app_dep,
+ gst_audio_dep,
ogg_dep,
pulse_dep,
opus_dep
@@ -143,8 +157,7 @@ testconvapi = executable ('test_conversation_api',
libgnunetmicrophone_dep,
],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install: false)
testconvapitwo = executable ('test_conversation_api_twocalls',
['test_conversation_api_twocalls.c'],
@@ -158,8 +171,7 @@ testconvapitwo = executable
('test_conversation_api_twocalls',
libgnunetmicrophone_dep,
],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install: false)
testconvapireject = executable ('test_conversation_api_reject',
['test_conversation_api_reject.c'],
@@ -173,8 +185,7 @@ testconvapireject = executable
('test_conversation_api_reject',
libgnunetmicrophone_dep,
],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install: false)
configure_file(input : 'test_conversation.conf',
output : 'test_conversation.conf',
diff --git a/src/contrib/service/template/meson.build
b/src/contrib/service/template/meson.build
index 7a30a7575..414abc880 100644
--- a/src/contrib/service/template/meson.build
+++ b/src/contrib/service/template/meson.build
@@ -3,15 +3,13 @@ gnunetservicetemplate_src = ['gnunet-service-template.c']
configure_file(input : 'template.conf',
output : 'template.conf',
configuration : cdata,
- install: true,
- install_dir: pkgcfgdir)
+ install: false)
executable ('gnunet-service-template',
gnunetservicetemplate_src,
dependencies: [libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install: false)
testtemplateapi = executable ('test_template_api',
['test_template_api.c'],
dependencies: [libgnunetutil_dep],
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index fc2facdbf..4d4c75756 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -84,7 +84,6 @@ gnunetinclude_HEADERS = \
gnunet_op_lib.h \
gnunet_os_lib.h \
gnunet_peer_lib.h \
- gnunet_peerinfo_service.h \
gnunet_peerstore_plugin.h \
gnunet_peerstore_service.h \
gnunet_plugin_lib.h \
diff --git a/src/include/gnunet_peerinfo_service.h
b/src/include/gnunet_peerinfo_service.h
deleted file mode 100644
index 806de963c..000000000
--- a/src/include/gnunet_peerinfo_service.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2009, 2010 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @addtogroup Backbone
- * @{
- *
- * @author Christian Grothoff
- *
- * @file
- * Maintain the list of currently known hosts
- *
- * @defgroup peerinfo Peer Info service
- * Maintain the list of currently known hosts.
- *
- * Holds an in-memory structure of data/hosts.
- *
- * @see [Documentation](https://gnunet.org/gnunets-peerinfo-subsystem)
- *
- * @{
- */
-
-#ifndef GNUNET_PEERINFO_SERVICE_H
-#define GNUNET_PEERINFO_SERVICE_H
-
-
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_hello_lib.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0 /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-
-/**
- * Handle to the peerinfo service.
- */
-struct GNUNET_PEERINFO_Handle;
-
-
-/**
- * Connect to the peerinfo service.
- *
- * @param cfg configuration to use
- * @return NULL on error (configuration related, actual connection
- * etablishment may happen asynchronously).
- */
-struct GNUNET_PEERINFO_Handle *
-GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
-
-
-/**
- * Disconnect from the peerinfo service. Note that all iterators must
- * have completed or have been cancelled by the time this function is
- * called (otherwise, calling this function is a serious error).
- * Furthermore, if #GNUNET_PEERINFO_add_peer() operations are still
- * pending, they will be cancelled silently on disconnect.
- *
- * @param h handle to disconnect
- */
-void
-GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h);
-
-
-/**
- * Add a host to the persistent list. This method operates in
- * semi-reliable mode: if the transmission is not completed by
- * the time #GNUNET_PEERINFO_disconnect() is called, it will be
- * aborted. Furthermore, if a second HELLO is added for the
- * same peer before the first one was transmitted, PEERINFO may
- * merge the two HELLOs prior to transmission to the service.
- *
- * @param h handle to the peerinfo service
- * @param hello the verified (!) HELLO message
- * @param cont continuation to call when done, NULL is allowed
- * @param cont_cls closure for @a cont
- * @return handle to cancel add operation; all pending
- * 'add' operations will be cancelled automatically
- * on disconnect, so it is not necessary to keep this
- * handle (unless @a cont is non-NULL and at some point
- * calling @a cont must be prevented)
- */
-struct GNUNET_MQ_Envelope *
-GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h,
- const struct GNUNET_HELLO_Message *hello,
- GNUNET_SCHEDULER_TaskCallback cont,
- void *cont_cls);
-
-
-/**
- * Type of an iterator over the hosts. Note that each
- * host will be called with each available protocol.
- *
- * @param cls closure
- * @param peer id of the peer, NULL for last call
- * @param hello hello message for the peer (can be NULL)
- * @param error message
- */
-typedef void
-(*GNUNET_PEERINFO_Processor) (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Message *hello,
- const char *err_msg);
-
-
-/**
- * Handle for cancellation of iteration over peers.
- */
-struct GNUNET_PEERINFO_IteratorContext;
-
-
-/**
- * Call a method for each known matching host. The callback method
- * will be invoked once for each matching host and then finally once
- * with a NULL pointer. After that final invocation, the iterator
- * context must no longer be used.
- *
- * Instead of calling this function with `peer == NULL` it is often
- * better to use #GNUNET_PEERINFO_notify().
- *
- * @param h handle to the peerinfo service
- * @param include_friend_only include HELLO messages for friends only
- * @param peer restrict iteration to this peer only (can be NULL)
- * @param callback the method to call for each peer
- * @param callback_cls closure for @a callback
- * @return iterator context
- */
-struct GNUNET_PEERINFO_IteratorContext *
-GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
- int include_friend_only,
- const struct GNUNET_PeerIdentity *peer,
- GNUNET_PEERINFO_Processor callback,
- void *callback_cls);
-
-
-/**
- * Cancel an iteration over peer information.
- *
- * @param ic context of the iterator to cancel
- */
-void
-GNUNET_PEERINFO_iterate_cancel (struct GNUNET_PEERINFO_IteratorContext *ic);
-
-
-/**
- * Handle for notifications about changes to the set of known peers.
- */
-struct GNUNET_PEERINFO_NotifyContext;
-
-
-/**
- * Call a method whenever our known information about peers
- * changes. Initially calls the given function for all known
- * peers and then only signals changes.
- *
- * If @a include_friend_only is set to #GNUNET_YES peerinfo will include HELLO
- * messages which are intended for friend to friend mode and which do not
- * have to be gossiped. Otherwise these messages are skipped.
- *
- * @param cfg configuration to use
- * @param include_friend_only include HELLO messages for friends only
- * @param callback the method to call for each peer
- * @param callback_cls closure for @a callback
- * @return NULL on error
- */
-struct GNUNET_PEERINFO_NotifyContext *
-GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
- int include_friend_only,
- GNUNET_PEERINFO_Processor callback,
- void *callback_cls);
-
-
-/**
- * Stop notifying about changes.
- *
- * @param nc context to stop notifying
- */
-void
-GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc);
-
-
-#if 0 /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/** @} */ /* end of group */
-
-/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_testbed_logger_service.h
b/src/include/gnunet_testbed_logger_service.h
deleted file mode 100644
index 7ab943b15..000000000
--- a/src/include/gnunet_testbed_logger_service.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2008--2013 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @addtogroup Testing
- * @{
- *
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- *
- * @file
- * API for submitting data to the testbed logger service
- *
- * @defgroup testbed-logger Testbed Logger service
- * Submit data to the testbed logger service.
- * @{
- */
-
-#ifndef GNUNET_TESTBED_LOGGER_SERVICE_H
-#define GNUNET_TESTBED_LOGGER_SERVICE_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0 /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-
-#include "gnunet_util_lib.h"
-
-/**
- * Opaque handle for the logging service
- */
-struct GNUNET_TESTBED_LOGGER_Handle;
-
-
-/**
- * Connect to the testbed logger service
- *
- * @param cfg configuration to use
- * @return the handle which can be used for sending data to the service; NULL
- * upon any error
- */
-struct GNUNET_TESTBED_LOGGER_Handle *
-GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
-
-
-/**
- * Disconnect from the logger service. Also cancels any pending send handles.
- *
- * @param h the logger handle
- */
-void
-GNUNET_TESTBED_LOGGER_disconnect (struct GNUNET_TESTBED_LOGGER_Handle *h);
-
-
-/**
- * Functions of this type are called to notify a successful transmission of the
- * message to the logger service.
- *
- * @param cls the closure given to GNUNET_TESTBED_LOGGER_send()
- * @param size the amount of data sent
- */
-typedef void
-(*GNUNET_TESTBED_LOGGER_FlushCompletion) (void *cls,
- size_t size);
-
-
-/**
- * Send data to be logged to the logger service. The data will be buffered and
- * will be sent upon an explicit call to GNUNET_TESTBED_LOGGER_flush() or upon
- * exceeding a threshold size.
- *
- * @param h the logger handle
- * @param data the data to send;
- * @param size how many bytes of @a data to send
- */
-void
-GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h,
- const void *data,
- size_t size);
-
-
-/**
- * Flush the buffered data to the logger service
- *
- * @param h the logger handle
- * @param cb the callback to call after the data is flushed
- * @param cb_cls the closure for @a cb
- */
-void
-GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h,
- GNUNET_TESTBED_LOGGER_FlushCompletion cb,
- void *cb_cls);
-
-
-/**
- * Cancel notification upon flush. Should only be used when the flush
- * completion callback given to GNUNET_TESTBED_LOGGER_flush() is not already
- * called.
- *
- * @param h the logger handle
- */
-void
-GNUNET_TESTBED_LOGGER_flush_cancel (struct GNUNET_TESTBED_LOGGER_Handle *h);
-
-
-#if 0 /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GNUNET_TESTBED_LOGGER_SERVICE_H */
-
-/** @} */ /* end of group */
-
-/** @} */ /* end of group addition */
-
-/* End of gnunet_testbed_logger_service.h */
diff --git a/src/include/gnunet_testbed_service.h
b/src/include/gnunet_testbed_service.h
deleted file mode 100644
index 2aeafc977..000000000
--- a/src/include/gnunet_testbed_service.h
+++ /dev/null
@@ -1,1735 +0,0 @@
-/*
- This file is part of GNUnet
- Copyright (C) 2008--2013 GNUnet e.V.
-
- GNUnet is free software: you can redistribute it and/or modify it
- under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @addtogroup Testing
- * @{
- *
- * @author Christian Grothoff
- *
- * @file
- * API for writing tests and creating large-scale emulation testbeds for
GNUnet.
- *
- * @defgroup testbed Testbed service
- * Writing tests and creating large-scale emulation testbeds for GNUnet.
- *
- * @see
[Documentation](https://docs.gnunet.org/handbook/gnunet.html#TESTBED-Subsystem)
- *
- * @{
- */
-
-#ifndef GNUNET_TESTBED_SERVICE_H
-#define GNUNET_TESTBED_SERVICE_H
-
-
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0 /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-
-/**
- * Opaque handle to a host running experiments managed by the testbed
framework.
- * The master process must be able to SSH to this host without password (via
- * ssh-agent).
- */
-struct GNUNET_TESTBED_Host;
-
-/**
- * Opaque handle to a peer controlled by the testbed framework. A peer runs
- * at a particular host.
- */
-struct GNUNET_TESTBED_Peer;
-
-/**
- * Opaque handle to an abstract operation to be executed by the testbed
framework.
- */
-struct GNUNET_TESTBED_Operation;
-
-/**
- * Handle to interact with a GNUnet testbed controller. Each
- * controller has at least one master handle which is created when the
- * controller is created; this master handle interacts with the
- * controller process, destroying it destroys the controller (by
- * closing stdin of the controller process). Additionally,
- * controllers can interact with each other (in a P2P fashion); those
- * links are established via TCP/IP on the controller's service port.
- */
-struct GNUNET_TESTBED_Controller;
-
-
-/**
- * Create a host to run peers and controllers on.
- *
- * @param hostname name of the host, use "NULL" for localhost
- * @param username username to use for the login; may be NULL
- * @param cfg the configuration to use as a template while starting a
controller
- * on this host. Operation queue sizes specific to a host are also
- * read from this configuration handle
- * @param port port number to use for ssh; use 0 to let ssh decide
- * @return handle to the host, NULL on error
- */
-struct GNUNET_TESTBED_Host *
-GNUNET_TESTBED_host_create (const char *hostname,
- const char *username,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- uint16_t port);
-
-
-/**
- * Create a host to run peers and controllers on. This function is used
- * if a peer learns about a host via IPC between controllers (and thus
- * some higher-level controller has already determined the unique IDs).
- *
- * @param id global host ID assigned to the host; 0 is
- * reserved to always mean 'localhost'
- * @param hostname name of the host, use "NULL" for localhost
- * @param username username to use for the login; may be NULL
- * @param cfg the configuration to use as a template while starting a
controller
- * on this host. Operation queue sizes specific to a host are also
- * read from this configuration handle
- * @param port port number to use for ssh; use 0 to let ssh decide
- * @return handle to the host, NULL on error
- */
-struct GNUNET_TESTBED_Host *
-GNUNET_TESTBED_host_create_with_id (uint32_t id,
- const char *hostname,
- const char *username,
- const struct GNUNET_CONFIGURATION_Handle
- *cfg,
- uint16_t port);
-
-
-/**
- * Load a set of hosts from a configuration file. The hostfile format is
- * specified at https://gnunet.org/content/hosts-file-format
- *
- * @param filename file with the host specification
- * @param cfg the configuration to use as a template while starting a
controller
- * on any of the loaded hosts. Operation queue sizes specific to a
host
- * are also read from this configuration handle
- * @param hosts set to the hosts found in the file; caller must free this if
- * number of hosts returned is greater than 0
- * @return number of hosts returned in 'hosts', 0 on error
- */
-unsigned int
-GNUNET_TESTBED_hosts_load_from_file (const char *filename,
- const struct GNUNET_CONFIGURATION_Handle
- *cfg,
- struct GNUNET_TESTBED_Host ***hosts);
-
-
-/**
- * Destroy a host handle. Must only be called once everything
- * running on that host has been stopped.
- *
- * @param host handle to destroy
- */
-void
-GNUNET_TESTBED_host_destroy (struct GNUNET_TESTBED_Host *host);
-
-
-/**
- * The handle for whether a host is habitable or not
- */
-struct GNUNET_TESTBED_HostHabitableCheckHandle;
-
-
-/**
- * Callbacks of this type are called by GNUNET_TESTBED_is_host_habitable to
- * inform whether the given host is habitable or not. The Handle returned by
- * GNUNET_TESTBED_is_host_habitable() is invalid after this callback is called
- *
- * @param cls the closure given to GNUNET_TESTBED_is_host_habitable()
- * @param host the host whose status is being reported; will be NULL if the
host
- * given to GNUNET_TESTBED_is_host_habitable() is NULL
- * @param status GNUNET_YES if it is habitable; GNUNET_NO if not
- */
-typedef void
-(*GNUNET_TESTBED_HostHabitableCallback) (void *cls,
- const struct GNUNET_TESTBED_Host
*host,
- int status);
-
-
-/**
- * Checks whether a host can be used to start testbed service
- *
- * @param host the host to check
- * @param config the configuration handle to lookup the path of the testbed
- * helper
- * @param cb the callback to call to inform about habitability of the given
host
- * @param cb_cls the closure for the callback
- * @return NULL upon any error or a handle which can be passed to
- * GNUNET_TESTBED_is_host_habitable_cancel()
- */
-struct GNUNET_TESTBED_HostHabitableCheckHandle *
-GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host,
- const struct GNUNET_CONFIGURATION_Handle
- *config,
- GNUNET_TESTBED_HostHabitableCallback cb,
- void *cb_cls);
-
-
-/**
- * Function to cancel a request started using
GNUNET_TESTBED_is_host_habitable()
- *
- * @param handle the habitability check handle
- */
-void
-GNUNET_TESTBED_is_host_habitable_cancel (struct
-
GNUNET_TESTBED_HostHabitableCheckHandle
- *handle);
-
-/**
- * Obtain the host's hostname.
- *
- * @param host handle to the host, NULL means 'localhost'
- * @return hostname of the host
- */
-const char *
-GNUNET_TESTBED_host_get_hostname (const struct GNUNET_TESTBED_Host *host);
-
-
-/**
- * Enumeration with (at most 64) possible event types that
- * can be monitored using the testbed framework.
- */
-enum GNUNET_TESTBED_EventType
-{
- /**
- * A peer has been started.
- */
- GNUNET_TESTBED_ET_PEER_START = 0,
-
- /**
- * A peer has been stopped.
- */
- GNUNET_TESTBED_ET_PEER_STOP = 1,
-
- /**
- * A connection between two peers was established.
- */
- GNUNET_TESTBED_ET_CONNECT = 2,
-
- /**
- * A connection between two peers was torn down.
- */
- GNUNET_TESTBED_ET_DISCONNECT = 3,
-
- /**
- * A requested testbed operation has been completed.
- */
- GNUNET_TESTBED_ET_OPERATION_FINISHED = 4,
-};
-
-
-/**
- * Types of information that can be requested about a peer.
- */
-enum GNUNET_TESTBED_PeerInformationType
-{
- /**
- * Special value (not valid for requesting information)
- * that is used in the event struct if a 'generic' pointer
- * is returned (for other operations not related to this
- * enumeration).
- */
- GNUNET_TESTBED_PIT_GENERIC = 0,
-
- /**
- * What configuration is the peer using? Returns a 'const struct
- * GNUNET_CONFIGURATION_Handle *'. Valid until
- * 'GNUNET_TESTNIG_operation_done' is called. However, the
- * values may be inaccurate if the peer is reconfigured in
- * the meantime.
- */
- GNUNET_TESTBED_PIT_CONFIGURATION,
-
- /**
- * What is the identity of the peer? Returns a
- * 'const struct GNUNET_PeerIdentity *'. Valid until
- * 'GNUNET_TESTNIG_operation_done' is called.
- */
- GNUNET_TESTBED_PIT_IDENTITY
-};
-
-
-/**
- * Argument to GNUNET_TESTBED_ControllerCallback with details about
- * the event.
- */
-struct GNUNET_TESTBED_EventInformation
-{
- /**
- * Type of the event.
- */
- enum GNUNET_TESTBED_EventType type;
-
- /**
- * Handle for the corresponding operation that generated this event
- */
- struct GNUNET_TESTBED_Operation *op;
-
- /**
- * Closure given while creating the above operation
- */
- void *op_cls;
-
- /**
- * Details about the event.
- */
- union
- {
- /**
- * Details about peer start event.
- */
- struct
- {
- /**
- * Handle for the host where the peer
- * was started.
- */
- struct GNUNET_TESTBED_Host *host;
-
- /**
- * Handle for the peer that was started.
- */
- struct GNUNET_TESTBED_Peer *peer;
- } peer_start;
-
- /**
- * Details about peer stop event.
- */
- struct
- {
- /**
- * Handle for the peer that was started.
- */
- struct GNUNET_TESTBED_Peer *peer;
- } peer_stop;
-
- /**
- * Details about connect event.
- */
- struct
- {
- /**
- * Handle for one of the connected peers.
- */
- struct GNUNET_TESTBED_Peer *peer1;
-
- /**
- * Handle for one of the connected peers.
- */
- struct GNUNET_TESTBED_Peer *peer2;
- } peer_connect;
-
- /**
- * Details about disconnect event.
- */
- struct
- {
- /**
- * Handle for one of the disconnected peers.
- */
- struct GNUNET_TESTBED_Peer *peer1;
-
- /**
- * Handle for one of the disconnected peers.
- */
- struct GNUNET_TESTBED_Peer *peer2;
- } peer_disconnect;
-
- /**
- * Details about an operation finished event.
- */
- struct
- {
- /**
- * Error message for the operation, NULL on success.
- */
- const char *emsg;
-
- /**
- * No result (NULL pointer) or generic result
- * (whatever the GNUNET_TESTBED_ConnectAdapter returned).
- */
- void *generic;
- } operation_finished;
- } details;
-};
-
-
-/**
- * Signature of the event handler function called by the
- * respective event controller.
- *
- * @param cls closure
- * @param event information about the event
- */
-typedef void
-(*GNUNET_TESTBED_ControllerCallback)(void *cls,
- const struct
- GNUNET_TESTBED_EventInformation *event);
-
-
-/**
- * Opaque Handle for Controller process
- */
-struct GNUNET_TESTBED_ControllerProc;
-
-
-/**
- * Callback to signal successful startup of the controller process
- *
- * @param cls the closure from GNUNET_TESTBED_controller_start()
- * @param cfg the configuration with which the controller has been started;
- * NULL if status is not #GNUNET_OK
- * @param status #GNUNET_OK if the startup is successful; #GNUNET_SYSERR if
not,
- * GNUNET_TESTBED_controller_stop() shouldn't be called in this case
- */
-typedef void
-(*GNUNET_TESTBED_ControllerStatusCallback) (void *cls,
- const struct
- GNUNET_CONFIGURATION_Handle *cfg,
- int status);
-
-
-/**
- * Starts a controller process at the given host. The given host's
configuration
- * is used as a Template configuration to use for the remote controller; the
- * remote controller will be started with a slightly modified configuration
- * (port numbers, unix domain sockets and service home values are changed as
per
- * TESTING library on the remote host). The modified configuration replaces
the
- * host's existing configuration before signalling success through the
- * GNUNET_TESTBED_ControllerStatusCallback()
- *
- * @param trusted_ip the ip address of the controller which will be set as
TRUSTED
- * HOST(all connections from this ip are permitted by the testbed)
when
- * starting testbed controller at host. This can either be a single ip
- * address or a network address in CIDR notation.
- * @param host the host where the controller has to be started. CANNOT be
NULL.
- * @param cb function called when the controller is successfully started or
- * dies unexpectedly; GNUNET_TESTBED_controller_stop shouldn't be
- * called if cb is called with GNUNET_SYSERR as status. Will never be
- * called in the same task as 'GNUNET_TESTBED_controller_start'
- * (synchronous errors will be signalled by returning NULL). This
- * parameter cannot be NULL.
- * @param cls closure for above callbacks
- * @return the controller process handle, NULL on errors
- */
-struct GNUNET_TESTBED_ControllerProc *
-GNUNET_TESTBED_controller_start (const char *trusted_ip,
- struct GNUNET_TESTBED_Host *host,
- GNUNET_TESTBED_ControllerStatusCallback cb,
- void *cls);
-
-
-/**
- * Stop the controller process (also will terminate all peers and controllers
- * dependent on this controller). This function blocks until the testbed has
- * been fully terminated (!). The controller status cb from
- * GNUNET_TESTBED_controller_start() will not be called.
- *
- * @param cproc the controller process handle
- */
-void
-GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc);
-
-
-/**
- * Connect to a controller process. The configuration to use for the
connection
- * is retrieved from the given host where a controller is started using
- * GNUNET_TESTBED_controller_start().
- *
- * @param host host to run the controller on; This should be the same host if
- * the controller was previously started with
- * GNUNET_TESTBED_controller_start()
- * @param event_mask bit mask with set of events to call 'cc' for;
- * or-ed values of "1LL" shifted by the
- * respective 'enum GNUNET_TESTBED_EventType'
- * (e.g. "(1LL << GNUNET_TESTBED_ET_CONNECT) | ...")
- * @param cc controller callback to invoke on events
- * @param cc_cls closure for cc
- * @return handle to the controller
- */
-struct GNUNET_TESTBED_Controller *
-GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host,
- uint64_t event_mask,
- GNUNET_TESTBED_ControllerCallback cc,
- void *cc_cls);
-
-
-/**
- * Stop the given controller (also will terminate all peers and
- * controllers dependent on this controller). This function
- * blocks until the testbed has been fully terminated (!).
- *
- * @param c handle to controller to stop
- */
-void
-GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *c);
-
-
-/**
- * Opaque handle for host registration
- */
-struct GNUNET_TESTBED_HostRegistrationHandle;
-
-
-/**
- * Callback which will be called to after a host registration succeeded or
failed
- *
- * @param cls the closure
- * @param emsg the error message; NULL if host registration is successful
- */
-typedef void
-(*GNUNET_TESTBED_HostRegistrationCompletion) (void *cls,
- const char *emsg);
-
-
-/**
- * Register a host with the controller. This makes the controller aware of the
- * host. A host should be registered at the controller before starting a
- * sub-controller on that host using GNUNET_TESTBED_controller_link().
- *
- * @param controller the controller handle
- * @param host the host to register
- * @param cc the completion callback to call to inform the status of
- * registration. After calling this callback the registration handle
- * will be invalid. Cannot be NULL
- * @param cc_cls the closure for the cc
- * @return handle to the host registration which can be used to cancel the
- * registration; NULL if another registration handle is present and
- * is not cancelled
- */
-struct GNUNET_TESTBED_HostRegistrationHandle *
-GNUNET_TESTBED_register_host (struct GNUNET_TESTBED_Controller *controller,
- struct GNUNET_TESTBED_Host *host,
- GNUNET_TESTBED_HostRegistrationCompletion cc,
- void *cc_cls);
-
-
-/**
- * Cancel the pending registration. Note that the registration message will
- * already be queued to be sent to the service, cancellation has only the
- * effect that the registration completion callback for the registration is
- * never called and from our perspective the host is not registered until the
- * completion callback is called.
- *
- * @param handle the registration handle to cancel
- */
-void
-GNUNET_TESTBED_cancel_registration (struct
GNUNET_TESTBED_HostRegistrationHandle
- *handle);
-
-
-/**
- * Callback to be called when an operation is completed
- *
- * @param cls the callback closure from functions generating an operation
- * @param op the operation that has been finished
- * @param emsg error message in case the operation has failed; will be NULL if
- * operation has executed successfully.
- */
-typedef void
-(*GNUNET_TESTBED_OperationCompletionCallback) (void *cls,
- struct GNUNET_TESTBED_Operation
*
- op,
- const char *emsg);
-
-
-/**
- * Create a link from slave controller to delegated controller. Whenever the
- * master controller is asked to start a peer at the delegated controller the
- * request will be routed towards slave controller (if a route exists). The
- * slave controller will then route it to the delegated controller. The
- * configuration of the delegated controller is given and is used to either
- * create the delegated controller or to connect to an existing controller.
Note
- * that while starting the delegated controller the configuration will be
- * modified to accommodate available free ports. the 'is_subordinate'
specifies
- * if the given delegated controller should be started and managed by the slave
- * controller, or if the delegated controller already has a master and the
slave
- * controller connects to it as a non master controller. The success or failure
- * of this operation will be signalled through the
- * GNUNET_TESTBED_ControllerCallback() with an event of type
- * #GNUNET_TESTBED_ET_OPERATION_FINISHED
- *
- * @param op_cls the operation closure for the event which is generated to
- * signal success or failure of this operation
- * @param master handle to the master controller who creates the association
- * @param delegated_host requests to which host should be delegated; cannot be
NULL
- * @param slave_host which host is used to run the slave controller; use NULL
to
- * make the master controller connect to the delegated host
- * @param is_subordinate #GNUNET_YES if the controller at delegated_host should
- * be started by the slave controller; #GNUNET_NO if the slave
- * controller has to connect to the already started delegated
- * controller via TCP/IP
- * @return the operation handle
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_controller_link (void *op_cls,
- struct GNUNET_TESTBED_Controller *master,
- struct GNUNET_TESTBED_Host *delegated_host,
- struct GNUNET_TESTBED_Host *slave_host,
- int is_subordinate);
-
-
-/**
- * Function to acquire the configuration of a running slave controller. The
- * completion of the operation is signalled through the controller_cb from
- * GNUNET_TESTBED_controller_connect(). If the operation is successful the
- * handle to the configuration is available in the generic pointer of
- * operation_finished field of `struct GNUNET_TESTBED_EventInformation`.
- *
- * @param op_cls the closure for the operation
- * @param master the handle to master controller
- * @param slave_host the host where the slave controller is running; the handle
- * to the slave_host should remain valid until this operation is
- * cancelled or marked as finished
- * @return the operation handle; NULL if the slave_host is not registered at
- * master
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_get_slave_config (void *op_cls,
- struct GNUNET_TESTBED_Controller *master,
- struct GNUNET_TESTBED_Host *slave_host);
-
-
-/**
- * Functions of this signature are called when a peer has been successfully
- * created
- *
- * @param cls the closure from GNUNET_TESTBED_peer_create()
- * @param peer the handle for the created peer; NULL on any error during
- * creation
- * @param emsg NULL if peer is not NULL; else MAY contain the error description
- */
-typedef void
-(*GNUNET_TESTBED_PeerCreateCallback) (void *cls,
- struct GNUNET_TESTBED_Peer *peer,
- const char *emsg);
-
-
-/**
- * Create the given peer at the specified host using the given
- * controller. If the given controller is not running on the target
- * host, it should find or create a controller at the target host and
- * delegate creating the peer. Explicit delegation paths can be setup
- * using 'GNUNET_TESTBED_controller_link'. If no explicit delegation
- * path exists, a direct link with a subordinate controller is setup
- * for the first delegated peer to a particular host; the subordinate
- * controller is then destroyed once the last peer that was delegated
- * to the remote host is stopped.
- *
- * Creating the peer only creates the handle to manipulate and further
- * configure the peer; use #GNUNET_TESTBED_peer_start and
- * #GNUNET_TESTBED_peer_stop to actually start/stop the peer's
- * processes.
- *
- * Note that the given configuration will be adjusted by the
- * controller to avoid port/path conflicts with other peers.
- * The "final" configuration can be obtained using
- * #GNUNET_TESTBED_peer_get_information.
- *
- * @param controller controller process to use
- * @param host host to run the peer on; cannot be NULL
- * @param cfg Template configuration to use for the peer. Should exist until
- * operation is cancelled or GNUNET_TESTBED_operation_done() is called
- * @param cb the callback to call when the peer has been created
- * @param cls the closure to the above callback
- * @return the operation handle
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
- struct GNUNET_TESTBED_Host *host,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_TESTBED_PeerCreateCallback cb,
- void *cls);
-
-
-/**
- * Functions of this signature are called when a peer has been successfully
- * started or stopped.
- *
- * @param cls the closure from GNUNET_TESTBED_peer_start/stop()
- * @param emsg NULL on success; otherwise an error description
- */
-typedef void
-(*GNUNET_TESTBED_PeerChurnCallback) (void *cls,
- const char *emsg);
-
-
-/**
- * Start the given peer.
- *
- * @param op_cls the closure for this operation; will be set in the event
- * information
- * @param peer peer to start
- * @param pcc function to call upon completion
- * @param pcc_cls closure for 'pcc'
- * @return handle to the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_start (void *op_cls,
- struct GNUNET_TESTBED_Peer *peer,
- GNUNET_TESTBED_PeerChurnCallback pcc,
- void *pcc_cls);
-
-
-/**
- * Stop the given peer. The handle remains valid (use
- * #GNUNET_TESTBED_peer_destroy to fully clean up the
- * state of the peer).
- *
- * @param op_cls the closure for this operation; will be set in the event
- * information
- * @param peer peer to stop
- * @param pcc function to call upon completion
- * @param pcc_cls closure for 'pcc'
- * @return handle to the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_stop (void *op_cls,
- struct GNUNET_TESTBED_Peer *peer,
- GNUNET_TESTBED_PeerChurnCallback pcc,
- void *pcc_cls);
-
-
-/**
- * Data returned from GNUNET_TESTBED_peer_get_information
- */
-struct GNUNET_TESTBED_PeerInformation
-{
- /**
- * Peer information type; captures which of the types
- * in the 'op_result' is actually in use.
- */
- enum GNUNET_TESTBED_PeerInformationType pit;
-
- /**
- * The result of the get information operation; Choose according to the pit
- */
- union
- {
- /**
- * The configuration of the peer
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * The identity of the peer
- */
- struct GNUNET_PeerIdentity *id;
- } result;
-};
-
-
-/**
- * Callback to be called when the requested peer information is available
- * The peer information in the callback is valid until the operation 'op' is
canceled.
- *
- * @param cb_cls the closure from GNUNET_TESTBED_peer_get_information()
- * @param op the operation this callback corresponds to
- * @param pinfo the result; will be NULL if the operation has failed
- * @param emsg error message if the operation has failed; will be NULL if the
- * operation is successful
- */
-typedef void
-(*GNUNET_TESTBED_PeerInfoCallback) (void *cb_cls,
- struct GNUNET_TESTBED_Operation *op,
- const struct
- GNUNET_TESTBED_PeerInformation *pinfo,
- const char *emsg);
-
-
-/**
- * Request information about a peer. The controller callback will not be called
- * with event type #GNUNET_TESTBED_ET_OPERATION_FINISHED when result for this
- * operation is available. Instead, the GNUNET_TESTBED_PeerInfoCallback() will
- * be called.
- * The peer information in the callback is valid until the operation is
canceled.
- *
- * @param peer peer to request information about
- * @param pit desired information
- * @param cb the convenience callback to be called when results for this
- * operation are available
- * @param cb_cls the closure for @a cb
- * @return handle to the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
- enum GNUNET_TESTBED_PeerInformationType
- pit,
- GNUNET_TESTBED_PeerInfoCallback cb,
- void *cb_cls);
-
-
-/**
- * Change @a peer configuration. Ports and paths cannot be changed this
- * way.
- *
- * @param peer peer to change configuration for
- * @param cfg new configuration
- * @return handle to the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer,
- const struct
- GNUNET_CONFIGURATION_Handle *cfg);
-
-
-/**
- * Destroy the given peer; the peer should have been
- * stopped first (if it was started).
- *
- * @param peer peer to stop
- * @return handle to the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer);
-
-
-/**
- * Start or stop given service at a peer. This should not be called to
- * start/stop the peer's ARM service. Use GNUNET_TESTBED_peer_start(),
- * GNUNET_TESTBED_peer_stop() for starting/stopping peer's ARM service.
Success
- * or failure of the generated operation is signalled through the controller
- * event callback and/or operation completion callback.
- *
- * @param op_cls the closure for the operation
- * @param peer the peer whose service is to be started/stopped
- * @param service_name the name of the service
- * @param cb the operation completion callback
- * @param cb_cls the closure for @a cb
- * @param start 1 to start the service; 0 to stop the service
- * @return an operation handle; NULL upon error (peer not running)
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_peer_manage_service (void *op_cls,
- struct GNUNET_TESTBED_Peer *peer,
- const char *service_name,
- GNUNET_TESTBED_OperationCompletionCallback
- cb,
- void *cb_cls,
- unsigned int start);
-
-
-/**
- * Stops and destroys all peers. Is equivalent of calling
- * GNUNET_TESTBED_peer_stop() and GNUNET_TESTBED_peer_destroy() on all peers,
- * except that the peer stop event and operation finished event corresponding
to
- * the respective functions are not generated. This function should be called
- * when there are no other pending operations. If there are pending
operations,
- * it will return NULL
- *
- * @param c the controller to send this message to
- * @param op_cls closure for the operation
- * @param cb the callback to call when all peers are stopped and destroyed
- * @param cb_cls the closure for the callback
- * @return operation handle on success; NULL if any pending operations are
- * present
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *c,
- void *op_cls,
- GNUNET_TESTBED_OperationCompletionCallback cb,
- void *cb_cls);
-
-
-/**
- * Options for peer connections.
- */
-enum GNUNET_TESTBED_ConnectOption
-{
- /**
- * No option (not valid as an argument).
- */
- GNUNET_TESTBED_CO_NONE = 0,
-
- /**
- * Allow or disallow a connection between the specified peers.
- * Followed by #GNUNET_NO (int) if a connection is disallowed
- * or #GNUNET_YES if a connection is allowed. Note that the
- * default (all connections allowed or disallowed) is
- * specified in the configuration of the controller.
- */
- GNUNET_TESTBED_CO_ALLOW = 1,
-
- /**
- * FIXME: add (and implement) options to limit connection to
- * particular transports, force simulation of particular latencies
- * or message loss rates, or set bandwidth limitations.
- */
-};
-
-
-/**
- * Manipulate the P2P underlay topology by configuring a link
- * between two peers.
- *
- * @param op_cls closure argument to give with the operation event
- * @param p1 first peer
- * @param p2 second peer
- * @param co option to change
- * @param ap option-specific values
- * @return handle to the operation, NULL if configuring the link at this
- * time is not allowed
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_link_va (void *op_cls,
- struct GNUNET_TESTBED_Peer *p1,
- struct GNUNET_TESTBED_Peer *p2,
- enum GNUNET_TESTBED_ConnectOption
co,
- va_list ap);
-
-
-/**
- * Manipulate the P2P underlay topology by configuring a link
- * between two peers.
- *
- * @param op_cls closure argument to give with the operation event
- * @param p1 first peer
- * @param p2 second peer
- * @param co option to change
- * @param ... option-specific values
- * @return handle to the operation, NULL if configuring the link at this
- * time is not allowed
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_link (void *op_cls,
- struct GNUNET_TESTBED_Peer *p1,
- struct GNUNET_TESTBED_Peer *p2,
- enum GNUNET_TESTBED_ConnectOption co,
- ...);
-
-
-/**
- * Topologies and topology options supported for testbeds. Options should
always
- * end with #GNUNET_TESTBED_TOPOLOGY_OPTION_END
- */
-enum GNUNET_TESTBED_TopologyOption
-{
- /**
- * A clique (everyone connected to everyone else). No options. If there are
N
- * peers this topology results in (N * (N -1)) connections.
- */
- GNUNET_TESTBED_TOPOLOGY_CLIQUE,
-
- /**
- * Small-world network (2d torus plus random links). Followed
- * by the number of random links to add (unsigned int).
- */
- GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD,
-
- /**
- * Small-world network (ring plus random links). Followed
- * by the number of random links to add (unsigned int).
- */
- GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING,
-
- /**
- * Ring topology. No options.
- */
- GNUNET_TESTBED_TOPOLOGY_RING,
-
- /**
- * Star topology. No options.
- */
- GNUNET_TESTBED_TOPOLOGY_STAR,
-
- /**
- * 2-d torus. No options.
- */
- GNUNET_TESTBED_TOPOLOGY_2D_TORUS,
-
- /**
- * Random graph. Followed by the number of random links to be established
- * (unsigned int)
- */
- GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
-
- /**
- * Certain percentage of peers are unable to communicate directly
- * replicating NAT conditions. Followed by the fraction of
- * NAT'ed peers (float).
- */
- GNUNET_TESTBED_TOPOLOGY_INTERNAT,
-
- /**
- * Scale free topology. It is generated according to the method described in
- * "Emergence of Scaling in Random Networks." Science 286, 509-512, 1999.
- *
- * This options takes two arguments in the following order: an uint16_t to
- * determine the maximum number of edges a peer is permitted to have while
- * generating scale free topology, a good value for this argument is 70; and
- * an uint8_t to determine the number of edges to be established when adding
a
- * new node to the scale free network, a good value for this argument is 4.
- */
- GNUNET_TESTBED_TOPOLOGY_SCALE_FREE,
-
- /**
- * Straight line topology. No options.
- */
- GNUNET_TESTBED_TOPOLOGY_LINE,
-
- /**
- * Read a topology from a given file. Followed by the name of the file
(const char *).
- */
- GNUNET_TESTBED_TOPOLOGY_FROM_FILE,
-
- /**
- * All peers are disconnected. No options.
- */
- GNUNET_TESTBED_TOPOLOGY_NONE,
-
- /**
- * The options should always end with this
- */
- GNUNET_TESTBED_TOPOLOGY_OPTION_END,
-
- /* The following are not topologies but influence how the topology has to be
- setup. These options should follow the topology specific options (if
- required by the chosen topology). Note that these should be given before
- GNUNET_TESTBED_TOPOLOGY_OPTION_END */
-
- /**
- * How many times should the failed overlay connect operations be retried
- * before giving up. The default if this option is not specified is to retry
- * 3 times. This option takes and unsigned integer as a parameter. Use this
- * option with parameter 0 to disable retrying of failed overlay connect
- * operations.
- */
- GNUNET_TESTBED_TOPOLOGY_RETRY_CNT
-};
-
-
-/**
- * Configure overall network topology to have a particular shape.
- *
- * @param op_cls closure argument to give with the operation event
- * @param num_peers number of peers in @a peers
- * @param peers array of @a num_peers with the peers to configure
- * @param topo desired underlay topology to use
- * @param ap topology-specific options
- * @return handle to the operation, NULL if configuring the topology
- * is not allowed at this time
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_topology_va (void *op_cls,
- unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **
- peers,
- enum
- GNUNET_TESTBED_TopologyOption
- topo,
- va_list ap);
-
-
-/**
- * Configure overall network topology to have a particular shape.
- *
- * @param op_cls closure argument to give with the operation event
- * @param num_peers number of peers in @a peers
- * @param peers array of @a num_peers with the peers to configure
- * @param topo desired underlay topology to use
- * @param ... topology-specific options
- * @return handle to the operation, NULL if configuring the topology
- * is not allowed at this time
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_underlay_configure_topology (void *op_cls,
- unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers,
- enum GNUNET_TESTBED_TopologyOption
- topo,
- ...);
-
-
-/**
- * Both peers must have been started before calling this function.
- * This function then obtains a HELLO from @a p1, gives it to @a p2
- * and asks @a p2 to connect to @a p1.
- *
- * @param op_cls closure argument to give with the operation event
- * @param cb the callback to call when this operation has finished
- * @param cb_cls the closure for @a cb
- * @param p1 first peer
- * @param p2 second peer
- * @return handle to the operation, NULL if connecting these two
- * peers is fundamentally not possible at this time (peers
- * not running or underlay disallows)
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_connect (void *op_cls,
- GNUNET_TESTBED_OperationCompletionCallback cb,
- void *cb_cls,
- struct GNUNET_TESTBED_Peer *p1,
- struct GNUNET_TESTBED_Peer *p2);
-
-
-/**
- * Callbacks of this type are called when topology configuration is completed
- *
- * @param cls the operation closure given to
- * GNUNET_TESTBED_overlay_configure_topology_va() and
- * GNUNET_TESTBED_overlay_configure() calls
- * @param nsuccess the number of successful overlay connects
- * @param nfailures the number of overlay connects which failed
- */
-typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls,
- unsigned int
- nsuccess,
- unsigned int
- nfailures);
-
-
-/**
- * All peers must have been started before calling this function.
- * This function then connects the given peers in the P2P overlay
- * using the given topology.
- *
- * @param op_cls closure argument to give with the peer connect operation
events
- * generated through this function
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
- * @param max_connections the maximums number of overlay connections that will
- * be made to achieve the given topology
- * @param comp_cb the completion callback to call when the topology generation
- * is completed
- * @param comp_cb_cls closure for the @a comp_cb
- * @param topo desired underlay topology to use
- * @param va topology-specific options
- * @return handle to the operation, NULL if connecting these
- * peers is fundamentally not possible at this time (peers
- * not running or underlay disallows) or if num_peers is less than 2
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
- unsigned int num_peers,
- struct GNUNET_TESTBED_Peer
**peers,
- unsigned int *max_connections,
-
GNUNET_TESTBED_TopologyCompletionCallback
- comp_cb,
- void *comp_cb_cls,
- enum
GNUNET_TESTBED_TopologyOption
- topo,
- va_list va);
-
-
-/**
- * All peers must have been started before calling this function.
- * This function then connects the given peers in the P2P overlay
- * using the given topology.
- *
- * @param op_cls closure argument to give with the peer connect operation
events
- * generated through this function
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
- * @param max_connections the maximums number of overlay connections that will
- * be made to achieve the given topology
- * @param comp_cb the completion callback to call when the topology generation
- * is completed
- * @param comp_cb_cls closure for the above completion callback
- * @param topo desired underlay topology to use
- * @param ... topology-specific options
- * @return handle to the operation, NULL if connecting these
- * peers is fundamentally not possible at this time (peers
- * not running or underlay disallows) or if num_peers is less than 2
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
- unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers,
- unsigned int *max_connections,
-
GNUNET_TESTBED_TopologyCompletionCallback
- comp_cb,
- void *comp_cb_cls,
- enum GNUNET_TESTBED_TopologyOption
- topo,
- ...);
-
-
-/**
- * Ask the testbed controller to write the current overlay topology to
- * a file. Naturally, the file will only contain a snapshot as the
- * topology may evolve all the time.
- * FIXME: needs continuation!?
- *
- * @param controller overlay controller to inspect
- * @param filename name of the file the topology should
- * be written to.
- */
-void
-GNUNET_TESTBED_overlay_write_topology_to_file (struct
- GNUNET_TESTBED_Controller *
- controller,
- const char *filename);
-
-
-/**
- * Adapter function called to establish a connection to
- * a service.
- *
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- * GNUNET_TESTBED_operation_done() is called on the operation returned
- * from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-typedef void *
-(*GNUNET_TESTBED_ConnectAdapter)(void *cls,
- const struct GNUNET_CONFIGURATION_Handle
*cfg);
-
-
-/**
- * Adapter function called to destroy a connection to
- * a service.
- *
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
- */
-typedef void
-(*GNUNET_TESTBED_DisconnectAdapter)(void *cls,
- void *op_result);
-
-
-/**
- * Callback to be called when a service connect operation is completed
- *
- * @param cls the callback closure from functions generating an operation
- * @param op the operation that has been finished
- * @param ca_result the service handle returned from
GNUNET_TESTBED_ConnectAdapter()
- * @param emsg error message in case the operation has failed; will be NULL if
- * operation has executed successfully.
- */
-typedef void
-(*GNUNET_TESTBED_ServiceConnectCompletionCallback) (void *cls,
- struct
- GNUNET_TESTBED_Operation
*op,
- void *ca_result,
- const char *emsg);
-
-
-/**
- * Connect to a service offered by the given peer. Will ensure that
- * the request is queued to not overwhelm our ability to create and
- * maintain connections with other systems. The actual service
- * handle is then returned via the 'op_result' member in the event
- * callback. The @a ca callback is used to create the connection
- * when the time is right; the @a da callback will be used to
- * destroy the connection (upon #GNUNET_TESTBED_operation_done).
- * #GNUNET_TESTBED_operation_done can be used to abort this
- * operation until the event callback has been called.
- *
- * @param op_cls closure to pass in operation event // FIXME: didn't we say
we'd no longer use the global callback for these? -CG
- * @param peer peer that runs the service
- * @param service_name name of the service to connect to
- * @param cb the callback to call when this operation is ready (that is,
- * right after the connect adapter returns)
- * @param cb_cls closure for @a cb
- * @param ca helper function to establish the connection
- * @param da helper function to close the connection
- * @param cada_cls closure for @a ca and @a da
- * @return handle for the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_service_connect (void *op_cls,
- struct GNUNET_TESTBED_Peer *peer,
- const char *service_name,
- GNUNET_TESTBED_ServiceConnectCompletionCallback
- cb,
- void *cb_cls,
- GNUNET_TESTBED_ConnectAdapter ca,
- GNUNET_TESTBED_DisconnectAdapter da,
- void *cada_cls);
-
-
-/**
- * This function is used to signal that the event information (struct
- * GNUNET_TESTBED_EventInformation) from an operation has been fully processed
- * i.e. if the event callback is ever called for this operation. If the event
- * callback for this operation has not yet been called, calling this function
- * cancels the operation, frees its resources and ensures the no event is
- * generated with respect to this operation. Note that however cancelling an
- * operation does NOT guarantee that the operation will be fully undone (or
that
- * nothing ever happened).
- *
- * This function MUST be called for every operation to fully remove the
- * operation from the operation queue. After calling this function, if
- * operation is completed and its event information is of type
- * GNUNET_TESTBED_ET_OPERATION_FINISHED, the 'op_result' becomes invalid (!).
-
- * If the operation is generated from GNUNET_TESTBED_service_connect() then
- * calling this function on such as operation calls the disconnect adapter if
- * the connect adapter was ever called.
- *
- * @param operation operation to signal completion or cancellation
- */
-void
-GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation);
-
-
-/**
- * Callback function to process statistic values from all peers.
- *
- * @param cls closure
- * @param peer the peer the statistic belong to
- * @param subsystem name of subsystem that created the statistic
- * @param name the name of the datum
- * @param value the current value
- * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if
not
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
- */
-typedef int
-(*GNUNET_TESTBED_StatisticsIterator) (void *cls,
- const struct GNUNET_TESTBED_Peer *peer,
- const char *subsystem,
- const char *name,
- uint64_t value,
- int is_persistent);
-
-
-/**
- * Convenience method that iterates over all (running) peers
- * and retrieves all statistics from each peer.
- *
- * @param num_peers number of peers to iterate over
- * @param peers array of peers to iterate over
- * @param subsystem limit to the specified subsystem, NULL for all subsystems
- * @param name name of the statistic value, NULL for all values
- * @param proc processing function for each statistic retrieved
- * @param cont continuation to call once call is completed. The completion of
this
- * operation is *ONLY* signalled through this callback -- no
- * GNUNET_TESTBED_ET_OPERATION_FINISHED is generated
- * @param cls closure to pass to proc and cont
- * @return operation handle to cancel the operation
- */
-struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_get_statistics (unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers,
- const char *subsystem, const char *name,
- GNUNET_TESTBED_StatisticsIterator proc,
- GNUNET_TESTBED_OperationCompletionCallback cont,
- void *cls);
-
-
-/**
- * Return the index of the peer inside of the total peer array,
- * aka. the peer's "unique ID".
- *
- * @param peer Peer handle.
- *
- * @return The peer's unique ID.
- */
-uint32_t
-GNUNET_TESTBED_get_index (const struct GNUNET_TESTBED_Peer *peer);
-
-
-/**
- * Handle for testbed run helper functions
- */
-struct GNUNET_TESTBED_RunHandle;
-
-
-/**
- * Signature of a main function for a testcase.
- *
- * @param cls closure
- * @param h the run handle
- * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed. NULL upon timeout (see
- * GNUNET_TESTBED_test_run()).
- * @param links_succeeded the number of overlay link connection attempts that
- * succeeded
- * @param links_failed the number of overlay link connection attempts that
- * failed
- * @see GNUNET_TESTBED_test_run()
- */
-typedef void
-(*GNUNET_TESTBED_TestMaster)(void *cls,
- struct GNUNET_TESTBED_RunHandle *h,
- unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers,
- unsigned int links_succeeded,
- unsigned int links_failed);
-
-
-/**
- * Convenience method for running a testbed with
- * a single call. Underlay and overlay topology
- * are configured using the "UNDERLAY" and "OVERLAY"
- * options in the "[testbed]" section of the configuration\
- * (with possible options given in "UNDERLAY_XXX" and/or
- * "OVERLAY_XXX").
- *
- * The test_master callback will be called once the testbed setup is finished
or
- * upon a timeout. This timeout is given through the configuration file by
- * setting the option "SETUP_TIMEOUT" in "[TESTBED]" section.
- *
- * The testbed is to be terminated using a call to
- * "GNUNET_SCHEDULER_shutdown".
- *
- * @param host_filename name of the file with the 'hosts', NULL
- * to run everything on 'localhost'
- * @param cfg configuration to use (for testbed, controller and peers)
- * @param num_peers number of peers to start; FIXME: maybe put that ALSO into
- * cfg?; should be greater than 0
- * @param event_mask bit mask with set of events to call 'cc' for;
- * or-ed values of "1LL" shifted by the
- * respective 'enum GNUNET_TESTBED_EventType'
- * (e.g. "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
- * @param cc controller callback to invoke on events; This callback is called
- * for all peer start events even if GNUNET_TESTBED_ET_PEER_START isn't
- * set in the event_mask as this is the only way get access to the
- * handle of each peer
- * @param cc_cls closure for cc
- * @param test_master this callback will be called once the test is ready or
- * upon timeout
- * @param test_master_cls closure for 'test_master'.
- */
-void
-GNUNET_TESTBED_run (const char *host_filename,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int num_peers,
- uint64_t event_mask,
- GNUNET_TESTBED_ControllerCallback cc,
- void *cc_cls,
- GNUNET_TESTBED_TestMaster test_master,
- void *test_master_cls);
-
-
-/**
- * Convenience method for running a "simple" test on the local system
- * with a single call from 'main'. Underlay and overlay topology are
- * configured using the "UNDERLAY" and "OVERLAY" options in the
- * "[TESTBED]" section of the configuration (with possible options
- * given in "UNDERLAY_XXX" and/or "OVERLAY_XXX").
- *
- * The test_master callback will be called once the testbed setup is finished
or
- * upon a timeout. This timeout is given through the configuration file by
- * setting the option "SETUP_TIMEOUT" in "[TESTBED]" section.
- *
- * The test is to be terminated using a call to
- * "GNUNET_SCHEDULER_shutdown". If starting the test fails,
- * the program is stopped without 'master' ever being run.
- *
- * NOTE: this function should be called from 'main', NOT from
- * within a GNUNET_SCHEDULER-loop. This function will initialize
- * the scheduler loop, the testbed and then pass control to
- * 'master'.
- *
- * @param testname name of the testcase (to configure logging, etc.)
- * @param cfg_filename configuration filename to use
- * (for testbed, controller and peers)
- * @param num_peers number of peers to start; should be greter than 0
- * @param event_mask bit mask with set of events to call 'cc' for;
- * or-ed values of "1LL" shifted by the
- * respective 'enum GNUNET_TESTBED_EventType'
- * (e.g. "(1LL << GNUNET_TESTBED_ET_CONNECT) || ...")
- * @param cc controller callback to invoke on events; This callback is called
- * for all peer start events even if #GNUNET_TESTBED_ET_PEER_START isn't
- * set in the event_mask as this is the only way get access to the
- * handle of each peer
- * @param cc_cls closure for @a cc
- * @param test_master this callback will be called once the test is ready or
- * upon timeout
- * @param test_master_cls closure for @a test_master.
- * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
- */
-int
-GNUNET_TESTBED_test_run (const char *testname,
- const char *cfg_filename,
- unsigned int num_peers,
- uint64_t event_mask,
- GNUNET_TESTBED_ControllerCallback cc,
- void *cc_cls,
- GNUNET_TESTBED_TestMaster test_master,
- void *test_master_cls);
-
-
-/**
- * Obtain handle to the master controller from a testbed run. The handle
- * returned should not be disconnected.
- *
- * @param h the testbed run handle
- * @return handle to the master controller
- */
-struct GNUNET_TESTBED_Controller *
-GNUNET_TESTBED_run_get_controller_handle (struct GNUNET_TESTBED_RunHandle *h);
-
-
-/**
- * Opaque handle for barrier
- */
-struct GNUNET_TESTBED_Barrier;
-
-
-/**
- * Status of a barrier
- */
-enum GNUNET_TESTBED_BarrierStatus
-{
- /**
- * Barrier initialised successfully
- */
- GNUNET_TESTBED_BARRIERSTATUS_INITIALISED = 1,
-
- /**
- * Barrier is crossed
- */
- GNUNET_TESTBED_BARRIERSTATUS_CROSSED,
-
- /**
- * Error status
- */
- GNUNET_TESTBED_BARRIERSTATUS_ERROR,
-};
-
-
-/**
- * Functions of this type are to be given as callback argument to
- * GNUNET_TESTBED_barrier_init(). The callback will be called when status
- * information is available for the barrier.
- *
- * @param cls the closure given to GNUNET_TESTBED_barrier_init()
- * @param name the name of the barrier
- * @param barrier the barrier handle
- * @param status status of the barrier. The barrier is removed once it has
been
- * crossed or an error occurs while processing it. Therefore it is
- * invalid to call GNUNET_TESTBED_barrier_cancel() on a crossed or
- * errored barrier.
- * @param emsg if the status were to be #GNUNET_SYSERR, this parameter has the
- * error message
- */
-typedef void
-(*GNUNET_TESTBED_barrier_status_cb) (void *cls,
- const char *name,
- struct GNUNET_TESTBED_Barrier *barrier,
- enum GNUNET_TESTBED_BarrierStatus status,
- const char *emsg);
-
-
-/**
- * Initialise a barrier and call the given callback when the required
percentage
- * of peers (quorum) reach the barrier.
- *
- * @param controller the handle to the controller
- * @param name identification name of the barrier
- * @param quorum the percentage of peers that is required to reach the barrier.
- * Peers signal reaching a barrier by calling
- * GNUNET_TESTBED_barrier_reached().
- * @param cb the callback to call when the barrier is reached or upon error.
- * Cannot be NULL.
- * @param cb_cls closure for @a cb
- * @return barrier handle
- */
-struct GNUNET_TESTBED_Barrier *
-GNUNET_TESTBED_barrier_init (struct GNUNET_TESTBED_Controller *controller,
- const char *name,
- unsigned int quorum,
- GNUNET_TESTBED_barrier_status_cb cb,
- void *cb_cls);
-
-
-/**
- * Cancel a barrier.
- *
- * @param barrier the barrier handle
- */
-void
-GNUNET_TESTBED_barrier_cancel (struct GNUNET_TESTBED_Barrier *barrier);
-
-
-/**
- * Opaque handle for barrier wait
- */
-struct GNUNET_TESTBED_BarrierWaitHandle;
-
-
-/**
- * Functions of this type are to be given as acallback argument to
- * GNUNET_TESTBED_barrier_wait(). The callback will be called when the barrier
- * corresponding given in GNUNET_TESTBED_barrier_wait() is crossed or
cancelled.
- *
- * @param cls closure pointer given to GNUNET_TESTBED_barrier_wait()
- * @param name the barrier name
- * @param status #GNUNET_SYSERR in case of error while waiting for the barrier;
- * #GNUNET_OK if the barrier is crossed
- */
-typedef void
-(*GNUNET_TESTBED_barrier_wait_cb) (void *cls,
- const char *name,
- int status);
-
-
-/**
- * Wait for a barrier to be crossed. This function should be called by the
- * peers which have been started by the testbed. If the peer is not started by
- * testbed this function may return error
- *
- * @param name the name of the barrier
- * @param cb the barrier wait callback
- * @param cls the closure for the above callback
- * @return barrier wait handle which can be used to cancel the waiting at
- * anytime before the callback is called. NULL upon error.
- */
-struct GNUNET_TESTBED_BarrierWaitHandle *
-GNUNET_TESTBED_barrier_wait (const char *name,
- GNUNET_TESTBED_barrier_wait_cb cb,
- void *cls);
-
-
-/**
- * Cancel a barrier wait handle. Should not be called in or after the callback
- * given to GNUNET_TESTBED_barrier_wait() has been called.
- *
- * @param h the barrier wait handle
- */
-void
-GNUNET_TESTBED_barrier_wait_cancel (struct GNUNET_TESTBED_BarrierWaitHandle
*h);
-
-
-/**
- * Model for configuring underlay links of a peer
- * @ingroup underlay
- */
-struct GNUNET_TESTBED_UnderlayLinkModel;
-
-
-/**
- * The type of GNUNET_TESTBED_UnderlayLinkModel
- * @ingroup underlay
- */
-enum GNUNET_TESTBED_UnderlayLinkModelType
-{
- /**
- * The model is based on white listing of peers to which underlay connections
- * are permitted. Underlay connections to all other peers will not be
- * permitted.
- */
- GNUNET_TESTBED_UNDERLAYLINKMODELTYPE_BLACKLIST,
-
- /**
- * The model is based on black listing of peers to which underlay connections
- * are not permitted. Underlay connections to all other peers will be
- * permitted
- */
- GNUNET_TESTBED_UNDERLAYLINKMODELTYPE_WHITELIST
-};
-
-
-/**
- * Create a GNUNET_TESTBED_UnderlayLinkModel for the given peer. A peer can
- * have ONLY ONE model and it can be either a blacklist or whitelist based one.
- *
- * @ingroup underlay
- * @param peer the peer for which the model has to be created
- * @param type the type of the model
- * @return the model
- */
-struct GNUNET_TESTBED_UnderlayLinkModel *
-GNUNET_TESTBED_underlaylinkmodel_create (struct GNUNET_TESTBED_Peer *peer,
- enum
- GNUNET_TESTBED_UnderlayLinkModelType
- type);
-
-
-/**
- * Add a peer to the given model. Underlay connections to the given peer will
- * be permitted if the model is whitelist based; otherwise they will not be
- * permitted.
- *
- * @ingroup underlay
- * @param model the model
- * @param peer the peer to add
- */
-void
-GNUNET_TESTBED_underlaylinkmodel_add_peer (struct
- GNUNET_TESTBED_UnderlayLinkModel *
- model,
- struct GNUNET_TESTBED_Peer *peer);
-
-
-/**
- * Set the metrics for a link to the given peer in the underlay model. The
link
- * SHOULD be permittable according to the given model.
- *
- * @ingroup underlay
- * @param model the model
- * @param peer the other end peer of the link
- * @param latency latency of the link in microseconds
- * @param loss data loss of the link expressed as a percentage
- * @param bandwidth bandwidth of the link in kilobytes per second [kB/s]
- */
-void
-GNUNET_TESTBED_underlaylinkmodel_set_link (struct
- GNUNET_TESTBED_UnderlayLinkModel *
- model,
- struct GNUNET_TESTBED_Peer *peer,
- uint32_t latency,
- uint32_t loss,
- uint32_t bandwidth);
-
-
-/**
- * Commit the model. The model is freed in this function(!).
- *
- * @ingroup underlay
- * @param model the model to commit
- */
-void
-GNUNET_TESTBED_underlaylinkmodel_commit (struct
- GNUNET_TESTBED_UnderlayLinkModel
*model);
-
-
-/**
- * Free the resources of the model. Use this function only if the model has
not
- * be committed and has to be unallocated. The peer can then have another
model
- * created.
- *
- * @ingroup underlay
- * @param model the model to unallocate
- */
-void
-GNUNET_TESTBED_underlaylinkmodel_free (struct
- GNUNET_TESTBED_UnderlayLinkModel
*model);
-
-
-#if 0 /* keep Emacsens' auto-indent happy */
-{
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/** @} */ /* end of group */
-
-/** @} */ /* end of group addition */
diff --git a/src/include/meson.build b/src/include/meson.build
index 5388ae649..3127a6a40 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -78,7 +78,6 @@ install_headers(
'gnunet_op_lib.h',
'gnunet_os_lib.h',
'gnunet_peer_lib.h',
- 'gnunet_peerinfo_service.h',
'gnunet_peerstore_plugin.h',
'gnunet_peerstore_service.h',
'gnunet_plugin_lib.h',
@@ -105,8 +104,6 @@ install_headers(
'gnunet_sq_lib.h',
'gnunet_statistics_service.h',
'gnunet_strings_lib.h',
- 'gnunet_testbed_service.h',
- 'gnunet_testbed_logger_service.h',
'gnunet_testing_barrier.h',
'gnunet_testing_lib.h',
'gnunet_testing_plugin.h',
diff --git a/src/service/core/meson.build b/src/service/core/meson.build
index 19ffd0ddc..09fdc8dab 100644
--- a/src/service/core/meson.build
+++ b/src/service/core/meson.build
@@ -63,8 +63,7 @@ shared_module('gnunet_test_core_plugin_cmd_just_run',
libgnunetarm_dep
],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir')/'gnunet')
+ install: false)
executable ('gnunet-service-core',
gnunetservicecore_src,
diff --git a/src/service/dns/meson.build b/src/service/dns/meson.build
index e1b7f7670..81fecd32a 100644
--- a/src/service/dns/meson.build
+++ b/src/service/dns/meson.build
@@ -39,14 +39,13 @@ executable ('gnunet-dns-monitor',
gnunetdnsmonitor_src,
dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir')/'gnunet'/'libexec')
+ install: false)
+
executable ('gnunet-dns-redirector',
gnunetdnsredirector_src,
dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir')/'gnunet'/'libexec')
+ install: false)
if host_machine.system() == 'linux'
executable ('gnunet-helper-dns',
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (47409fa1f -> 83fbbaeff),
gnunet <=