[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (d4c4b1050 -> 361f1d528)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (d4c4b1050 -> 361f1d528) |
|
Date: |
Fri, 24 May 2024 09:50:20 +0200 |
This is an automated email from the git hooks/post-receive script.
t3sserakt pushed a change to branch master
in repository gnunet.
from d4c4b1050 testing: fix missing header in dist tarball for transport
testing !tarball
new 2d53f05b9 Testbed: Removed accidentally added config.
new bb67f5a08 Testing: Started with new topology file format parsing.
new 361f1d528 Transport: Make communicator tests run again.
The 3 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:
src/lib/testing/test_netjail_topo.conf | 656 +--------------------------------
src/lib/testing/testing_api_topology.c | 262 ++++++++++++-
src/lib/testing/testing_api_topology.h | 133 ++++++-
src/service/transport/Makefile.am | 78 ++--
4 files changed, 433 insertions(+), 696 deletions(-)
diff --git a/src/lib/testing/test_netjail_topo.conf
b/src/lib/testing/test_netjail_topo.conf
index 064fb7d27..4bb0e6b6c 100644
--- a/src/lib/testing/test_netjail_topo.conf
+++ b/src/lib/testing/test_netjail_topo.conf
@@ -1,658 +1,12 @@
-[abd]
-BINARY = gnunet-service-abd
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-abd.sock
-RUN_PER_USER = YES
-OPTIONS = -L DEBUG
-
-[arm]
-HOSTNAME = localhost
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-GLOBAL_PREFIX =
-OPTIONS = -l $GNUNET_CACHE_HOME/gnunet-%Y-%m-%d.log
-CONFIG = /home/user/Documents/gnunet/src/lib/testing/test_netjail_topo.conf
-
-[auction]
-START_ON_DEMAND = NO
-BINARY = gnunet-service-auction
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-auction.sock
-
-[cadet]
-IMMEDIATE_START = YES
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-cadet
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-cadet.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-REFRESH_CONNECTION_TIME = 5 min
-ID_ANNOUNCE_TIME = 1 h
-CONNECT_TIMEOUT = 30 s
-DHT_REPLICATION_LEVEL = 3
-MAX_CONNECTIONS = 1000
-MAX_ROUTES = 5000
-MAX_MSGS_QUEUE = 10000
-MAX_PEERS = 1000
-RATCHET_TIME = 1 h
-RATCHET_MESSAGES = 64
-
-[consensus]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-consensus
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-consensus.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[core]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-USE_EPHEMERAL_KEYS = YES
-
-[datacache-postgres]
-CONFIG = postgres:///gnunet
-SQL_DIR = $DATADIR/sql/
-
-[datastore]
-START_ON_DEMAND = YES
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 5 GB
-BLOOMFILTER = $GNUNET_DATA_HOME/datastore/bloomfilter
-DATABASE = sqlite
-
-[datastore-sqlite]
-FILENAME = $GNUNET_DATA_HOME/datastore/sqlite.db
-
-[datastore-postgres]
-CONFIG = postgres:///gnunet
-SQL_DIR = ${DATADIR}/sql/
-
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datastore-heap]
-HASHMAPSIZE = 1024
-
-[dht]
-IMMEDIATE_START = YES
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dht.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-CACHE_RESULTS = YES
-DISABLE_TRY_CONNECT = NO
-
-[dhtcache]
-DATABASE = heap
-QUOTA = 50 MB
-DISABLE_BF_RC = NO
-
-[dhtu-gnunet]
-ENABLED = YES
-
-[dhtu-ip]
-ENABLED = NO
-NSE = 4
-UDP_PORT = 6666
-
-[dns]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-dns
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-IFNAME = gnunet-dns
-IPV6ADDR = 2001:DB8::1
-IPV6PREFIX = 126
-IPV4ADDR = 169.254.1.1
-IPV4MASK = 255.255.0.0
-DNS_EXIT = 8.8.8.8
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 2001:DB8::1
-IPV6PREFIX = 64
-IPV4ADDR = 169.254.86.1
-IPV4MASK = 255.255.255.0
-EXIT_RANGE_IPV4_POLICY = 0.0.0.0/0:!25;
-EXIT_RANGE_IPV6_POLICY = ::/0:!25;
-NOARMBIND = YES
-TUN_IFNAME = exit-gnunet
-EXIT_IFNAME = eth0
-EXIT_IPV4 = NO
-EXIT_IPV6 = NO
-EXIT_DNS = NO
-DNS_RESOLVER = 8.8.8.8
-ENABLE_IPV4 = YES
-ENABLE_IPV6 = YES
-MAX_CONNECTIONS = 256
-
-[fs]
-RUN_PER_USER = YES
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
-RESPECT = $GNUNET_DATA_HOME/fs/credit/
-STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
-UPDATE_DIR = $GNUNET_DATA_HOME/fs/updates/
-HOSTNAME = localhost
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-fs.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-DATASTORE_QUEUE_SIZE = 32
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-DISABLE_ANON_TRANSFER = NO
-MAX_CADET_CLIENTS = 128
-
-[gns]
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-gns
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PARALLEL_BACKGROUND_QUERIES = 1000
-INTERCEPT_DNS = NO
-.pin.gns.alt = 000G0522TTKQESZ9KPRT2K0RA9ZC8YMD52D2XYVYVGPDCNPMWHH9QXXF4W
-.gnunet.gns.alt = 000G0522TTKQESZ9KPRT2K0RA9ZC8YMD52D2XYVYVGPDCNPMWHH9QXXF4W
-
-[gns-proxy]
-BINARY = gnunet-gns-proxy
-START_ON_DEMAND = NO
-RUN_PER_USER = YES
-BIND_TO = 127.0.0.1
-BIND_TO6 = ::1
-PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
-PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
-
-[bcd]
-BINARY = gnunet-bcd
-OPTIONS = -p 8888
-START_ON_DEMAND = NO
-RUN_PER_USER = YES
-
-[dns2gns]
-BINARY = gnunet-dns2gns
-START_ON_DEMAND = NO
-RUN_PER_USER = NO
-BIND_TO = 127.0.0.1
-BIND_TO6 = ::1
-OPTIONS = -d 9.9.9.9
-PORT = 15353
-ENABLE_RESOLVECTL_NMDISPATCHER = NO
-
-[hostlist]
-IMMEDIATE_START = YES
-NOARMBIND = YES
-BINARY = gnunet-daemon-hostlist
-HTTPPORT = 8080
-HOSTLISTFILE = $GNUNET_CONFIG_HOME/hostlist/learned.txt
-OPTIONS = -b
-SERVERS = https://v21.gnunet.org/hostlist
-
-[identity]
-START_ON_DEMAND = YES
-RUN_PER_USER = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-identity
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-identity.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-EGODIR = $GNUNET_DATA_HOME/identity/egos/
-SUBSYSTEM_CFG = $GNUNET_CONFIG_HOME/identity/subsystem_defaults.conf
-
-[messenger]
-START_ON_DEMAND = YES
-RUN_PER_USER = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-messenger
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-messenger.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MESSENGER_DIR = $GNUNET_DATA_HOME/messenger/
-MESSENGER_AUTO_CONNECTING = YES
-MESSENGER_AUTO_ROUTING = YES
-MESSENGER_MIN_ROUTERS = 3
-
-[namecache]
-START_ON_DEMAND = YES
-RUN_PER_USER = NO
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-namecache
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DATABASE = sqlite
-DISABLE = NO
-
-[namecache-sqlite]
-FILENAME = $GNUNET_DATA_HOME/namecache/sqlite.db
-
-[namecache-flat]
-FILENAME = $GNUNET_DATA_HOME/namecache/flat.db
-
-[namecache-postgres]
-CONFIG = postgres:///gnunet
-SQL_DIR = ${DATADIR}/sql/
-
-[namestore]
-START_ON_DEMAND = YES
-RUN_PER_USER = YES
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-namestore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DATABASE = sqlite
-CACHE_KEYS = YES
-
-[namestore-sqlite]
-INIT_ON_CONNECT = YES
-FILENAME = $GNUNET_DATA_HOME/namestore/sqlite.db
-
-[namestore-postgres]
-CONFIG = postgres:///gnunet
-ASYNC_COMMIT = NO
-INIT_ON_CONNECT = YES
-SQL_DIR = ${DATADIR}/sql/
-
-[uri]
-gns = gnunet-namestore -e 1a -u
-
-[nat-auto]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-nat-auto
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-nat-auto.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 5724
-NOARMBIND = YES
-
-[nat]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-nat
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-nat.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-ENABLE_UPNP = YES
-ENABLE_IPSCAN = YES
-DISABLEV6 = NO
-HOSTNAME_DNS_FREQUENCY = 20 min
-IFC_SCAN_FREQUENCY = 15 min
-DYNDNS_FREQUENCY = 7 min
-USE_STUN = YES
-STUN_FREQUENCY = 5 min
-STUN_SERVERS = stun.gnunet.org stun.services.mozilla.com:3478
stun.ekiga.net:3478
-STUN_STALE = 60 min
-
-[nse]
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-nse.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat
-HISTOGRAM_DIR = $GNUNET_CACHE_HOME/nse/histogram
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 15
-
-[peerstore]
-IMMEDIATE_START = YES
-USE_INCLUDED_HELLOS = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-peerstore
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerstore.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-DATABASE = sqlite
-
-[peerstore-sqlite]
-FILENAME = $GNUNET_DATA_HOME/peerstore/sqlite.db
-
-[pt]
-BINARY = gnunet-daemon-pt
-NOARMBIND = YES
-TUNNEL_IPV4 = NO
-TUNNEL_IPV6 = NO
-TUNNEL_DNS = NO
-
-[reclaim]
-START_ON_DEMAND = YES
-RUN_PER_USER = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-reclaim
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-reclaim.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-TICKET_REFRESH_INTERVAL = 6h
-
-[reclaim-rest-plugin]
-ADDRESS = https://ui.reclaim/#/login
-OIDC_JSON_WEB_ALGORITHM = RS256
-OIDC_CLIENT_HMAC_SECRET = secret
-OIDC_DIR = $GNUNET_DATA_HOME/oidc
-OIDC_USERINFO_CONSUME_TIMEOUT = 5s
-JWT_SECRET = secret
-EXPIRATION_TIME = 1d
-
-[regex]
-START_ON_DEMAND = YES
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock
-HOSTNAME = localhost
-BINARY = gnunet-service-regex
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-[resolver]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-
-[rest]
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-rest.sock
-BINARY = gnunet-rest-server
-IMMEDIATE_START = YES
-HTTP_PORT = 7776
-BIND_TO = 127.0.0.1
-BIND_TO6 = ::1
-REST_ALLOW_HEADERS = Authorization,Accept,Content-Type
-REST_ECHO_ORIGIN_WEBEXT = YES
-REST_ALLOW_ORIGIN = http://localhost:4200
-REST_ALLOW_CREDENTIALS = true
-RUN_PER_USER = NO
-BASIC_AUTH_SECRET_FILE = $GNUNET_DATA_HOME/rest/secret
-BASIC_AUTH_ENABLED = YES
-
-[revocation]
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-revocation
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-revocation.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-WORKBITS = 22
-EPOCH_DURATION = 365 d
-DATABASE = $GNUNET_DATA_HOME/revocation.dat
-
-[rps]
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-BINARY = gnunet-service-rps
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-rps.sock
-HOME = $SERVICEHOME
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTNAME = localhost
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-ROUNDINTERVAL = 30 s
-FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt
-MINSIZE = 10
-DESIRED_PROBABILITY = 0.9
-DEFICIENCY_FACTOR = 0.4
-
-[scalarproduct-alice]
-START_ON_DEMAND = YES
-BINARY = gnunet-service-scalarproduct-ecc-alice
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-alice.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[scalarproduct-bob]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-scalarproduct-ecc-bob
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-bob.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[secretsharing]
-START_ON_DEMAND = NO
-HOSTNAME = localhost
-BINARY = gnunet-service-secretsharing
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-secretsharing.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[set]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-set
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-set.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[seti]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-seti
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-seti.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[setu]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-setu
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-setu.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[statistics]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-DATABASE = $GNUNET_DATA_HOME/statistics.dat
-
-[template]
-START_ON_DEMAND = NO
-PORT = 99999
-HOSTNAME = localhost
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-template.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[TESTING]
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-SPEEDUP_INTERVAL = 0 ms
-SPEEDUP_DELTA = 0 ms
-USE_ABSTRACT_SOCKETS = NO
-
-[topology]
-IMMEDIATE_START = YES
-NOARMBIND = YES
-TARGET-CONNECTION-COUNT = 16
-BINARY = gnunet-daemon-topology
-
-[transport]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-transport
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
-
-[communicator-tcp]
-BINDTO = 2086
-DISABLE_V6 = NO
-BINARY = gnunet-communicator-tcp
-IMMEDIATE_START = YES
-
-[communicator-udp]
-BINARY = gnunet-communicator-udp
-BINDTO = 2086
-DISABLE_V6 = NO
-IMMEDIATE_START = YES
-
-[communicator-quic]
-BINDTO = 127.0.0.1
-
-[PEER]
-PRIVATE_KEY = $GNUNET_DATA_HOME/private_key.ecc
-SYSTEM_TYPE = UNKNOWN
-
-[vpn]
-START_ON_DEMAND = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-vpn
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[zonemaster]
-START_ON_DEMAND = YES
-RUN_PER_USER = YES
-IMMEDIATE_START = YES
-HOSTNAME = localhost
-BINARY = gnunet-service-zonemaster
-UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster.sock
-WORKER_COUNT = 4
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-MAX_PARALLEL_BACKGROUND_QUERIES = 1000
-ZONE_PUBLISH_TIME_WINDOW = 4 h
-
[DEFAULTS]
-SUBNETS = 42
+SUBNETS =
CARRIER_SETUP_PROGRAMMS = iptables -A INPUT -p icmp -j DROP;tc qdisc add dev
$UPLINK root netm delay 100ms 10ms;
SUBNET_SETUP_PROGRAMMS = iptables -A INPUT -p icmp -j DROP;tc qdisc add dev
$UPLINK root netm delay 100ms 10ms;
PEER_SETUP_PROGRAMMS = iptables -A INPUT -p icmp -j DROP;tc qdisc add dev
$UPLINK root netm delay 100ms 10ms;
-TESTBED_PLUGIN = normal
-PLUGIN_ENV = key=value;key=value;
+TESTBED_PLUGIN = ping
CARRIER_PEERS = 1
-SUBNET_PEERS = 4
+SUBNET_PEERS = 1
[BACKBONE]
-CARRIERS = 2
-BACKBONE_PEERS = 1
-
-[BACKBONE-PEER-1]
-TESTBED_PLUGIN = server
-
-[CARRIER-1]
-CARRIER_PEERS = 2
-SUBNETS = 2
-
-[CARRIER-2]
-TESTBED_PLUGIN = mobile_network
-
-[CARRIER-2-PEER-1]
-TESTBED_PLUGIN = mobile_network
-
-[CARRIER-1-SUBNET-1]
-SUBNET = 8.8.0.0/16
-SUBNET_PEERS = 2
-TESTBED_PLUGIN = pc
-
-[CARRIER-1-SUBNET-2]
-IPTABLES_ARGS = -A ... $UPLINK; -A ... $DOWNLINK;
-
-[CARRIER-1-SUBNET-1-PEER-1]
-TESTBED_PLUGIN = evil
-IPTABLES_ARGS = -A ... $DOWNLINK;
-
-[PATHS]
-GNUNET_HOME = ${GNUNET_TEST_HOME:-${HOME:-${USERPROFILE}}}
-GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/
-GNUNET_CONFIG_HOME = ${XDG_CONFIG_HOME:-$GNUNET_HOME/.config}/gnunet/
-GNUNET_CACHE_HOME = ${XDG_CACHE_HOME:-$GNUNET_HOME/.cache}/gnunet/
-GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/
-GNUNET_USER_RUNTIME_DIR =
${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/
-GNUNET_TMP = ${TMPDIR:-${TMP:-/tmp}}/gnunet/
-
+CARRIERS = 1
+BACKBONE_PEERS = 1
\ No newline at end of file
diff --git a/src/lib/testing/testing_api_topology.c
b/src/lib/testing/testing_api_topology.c
index 7221d4f39..c400b3c1b 100644
--- a/src/lib/testing/testing_api_topology.c
+++ b/src/lib/testing/testing_api_topology.c
@@ -626,6 +626,15 @@ free_namespaces_cb (void *cls,
}
+static int
+free_value_cb (void *cls,
+ const struct GNUNET_ShortHashCode *key,
+ void *value)
+{
+ (void) cls;
+
+ GNUNET_free (value);
+
/**
* Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
*
@@ -633,6 +642,25 @@ free_namespaces_cb (void *cls,
*/
void
GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
+{
+ GNUNET_CONTAINER_multishortmap_iterate (topology->backbone_peers,
+ &free_value_cb,
+ NULL);
+ GNUNET_CONTAINER_multishortmap_iterate (topology->carriers,
+ &free_carriers_cb,
+ NULL);
+ GNUNET_free (topology->plugin);
+ GNUNET_free (topology);
+}
+
+
+/**
+ * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
+ *
+ * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
+ *
+void
+GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
{
GNUNET_CONTAINER_multishortmap_iterate (topology->map_namespaces,
&free_namespaces_cb,
@@ -644,7 +672,7 @@ GNUNET_TESTING_free_topology (struct
GNUNET_TESTING_NetjailTopology *topology)
GNUNET_CONTAINER_multishortmap_destroy (topology->map_globals);
GNUNET_free (topology->plugin);
GNUNET_free (topology);
-}
+ }*/
unsigned int
@@ -804,12 +832,240 @@ GNUNET_TESTING_get_plugin_from_topo (
}
+static void
+create_subnet_peers (struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_NetjailTopology *topology,
+ struct GNUNET_TESTING_NetjailSubnet *subnet)
+{
+ struct GNUNET_HashCode hc;
+
+ for (int i = 1; i < subnet->number_peers; i++)
+ {
+ struct GNUNET_ShortHashCode hkey;
+ struct GNUNET_TESTING_NetjailSubnetPeer *subnet_peer = GNUNET_new (struct
GNUNET_TESTING_NetjailSubnetPeer);
+
+ topology->total++;
+ GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+ memcpy (&hkey,
+ &hc,
+ sizeof (hkey));
+ GNUNET_CONTAINER_multishortmap_put (subnet->peers,
+ &hkey,
+ subnet_peer,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ }
+}
+
+
+static void
+create_subnets (struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_NetjailTopology *topology,
+ struct GNUNET_TESTING_NetjailCarrier *carrier)
+{
+ struct GNUNET_HashCode hc;
+
+ for (int i = 1; i < carrier->number_subnets; i++)
+ {
+ struct GNUNET_ShortHashCode hkey;
+ struct GNUNET_TESTING_NetjailSubnet *subnet = GNUNET_new (struct
GNUNET_TESTING_NetjailSubnet);
+ char *section;
+
+ topology->total++;
+ subnet->number = topology->total;
+ subnet->index = i;
+ GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+ memcpy (&hkey,
+ &hc,
+ sizeof (hkey));
+ GNUNET_CONTAINER_multishortmap_put (carrier->subnets,
+ &hkey,
+ subnet,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_asprintf (§ion, "CARRIER-%u-SUBNET-%u", carrier->index, i);
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ section,
+ "SUBNET_PEERS",
+ (unsigned long long
*) &subnet->number_peers))
+ {
+ subnet->number_peers = topology->default_subnet_peers;
+ }
+
+ create_subnet_peers (cfg, topology, subnet);
+
+ GNUNET_free (section);
+ }
+}
+
+
+static void
+create_peers (struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_NetjailTopology *topology,
+ struct GNUNET_TESTING_NetjailCarrier *carrier)
+{
+ struct GNUNET_HashCode hc;
+
+ for (int i = 1; i < carrier->number_peers; i++)
+ {
+ struct GNUNET_ShortHashCode hkey;
+ struct GNUNET_TESTING_NetjailCarrierPeer *peer = GNUNET_new (struct
GNUNET_TESTING_NetjailCarrierPeer);
+
+ topology->total++;
+ peer->number = topology->total;
+ GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+ memcpy (&hkey,
+ &hc,
+ sizeof (hkey));
+ GNUNET_CONTAINER_multishortmap_put (carrier->peers,
+ &hkey,
+ peer,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ //GNUNET_asprintf (§ion, "CARRIER-%u-PEER-%u", carrier->index, i);
+ }
+}
+
+
+struct GNUNET_TESTING_NetjailTopology *
+GNUNET_TESTING_get_topo_from_string_ (const char *input)
+{
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ struct GNUNET_TESTING_NetjailTopology *topology = GNUNET_new (struct
GNUNET_TESTING_NetjailTopology);
+ topology->backbone_peers = GNUNET_CONTAINER_multishortmap_create
(1,GNUNET_NO);
+ topology->carriers = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+ struct GNUNET_HashCode hc;
+
+ cfg = GNUNET_CONFIGURATION_create ();
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_deserialize (cfg,
+ input,
+ strlen (input),
+ NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _ ("Failed to parse configuration.\n"));
+ GNUNET_CONFIGURATION_destroy (cfg);
+ return NULL;
+ }
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ "DEFAULTS",
+ "SUBNETS",
+ (unsigned long long
*) &topology->default_subnets))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Missing default SUBNETS!\n");
+ return NULL;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
+ "DEFAULTS",
+ "TESTBED_PLUGIN",
+ &topology->plugin))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Missing default TESTBED_PLUGIN!\n");
+ return NULL;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ "DEFAULTS",
+ "CARRIER_PEERS",
+ (unsigned long long
*) &topology->default_carrier_peers))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Missing default CARRIER_PEERS!\n");
+ return NULL;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ "DEFAULTS",
+ "SUBNET_PEERS",
+ (unsigned long long
*) &topology->default_subnet_peers))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Missing default SUBNET_PEERS!\n");
+ return NULL;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ "BACKBONE",
+ "CARRIERS",
+ (unsigned long long
*) &topology->num_carriers))
+ {
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "No carrier configured!\n");
+ return NULL;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ "BACKBONE",
+ "CARRIERS",
+ (unsigned long long
*) &topology->num_backbone_peers))
+ {
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "No backbone peers configured!\n");
+ return NULL;
+ }
+ for (int i = 0;i < topology->num_backbone_peers; i++)
+ {
+ struct GNUNET_TESTING_NetjailBackbonePeer *peer = GNUNET_new (struct
GNUNET_TESTING_NetjailBackbonePeer);
+ struct GNUNET_ShortHashCode hkey;
+
+ topology->total++;
+ peer->number = topology->total;
+ GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+ memcpy (&hkey,
+ &hc,
+ sizeof (hkey));
+ GNUNET_CONTAINER_multishortmap_put (topology->backbone_peers,
+ &hkey,
+ peer,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ }
+ for (int i = 0;i < topology->num_carriers; i++)
+ {
+ struct GNUNET_TESTING_NetjailCarrier *carrier = GNUNET_new (struct
GNUNET_TESTING_NetjailCarrier);
+ struct GNUNET_ShortHashCode hkey;
+ char *section;
+
+ topology->total++;
+ carrier->number = topology->total;
+ GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+ memcpy (&hkey,
+ &hc,
+ sizeof (hkey));
+ GNUNET_CONTAINER_multishortmap_put (topology->carriers,
+ &hkey,
+ carrier,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_asprintf (§ion, "CARRIER-%u", i);
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ section,
+ "SUBNETS",
+ (unsigned long long
*) &carrier->number_subnets))
+ {
+ carrier->number_subnets = topology->default_subnets;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+ section,
+ "CARRIER_PEERS",
+ (unsigned long long
*) &carrier->number_peers))
+ {
+ carrier->number_peers = topology->default_carrier_peers;
+ }
+ create_peers (cfg, topology, carrier);
+ create_subnets (cfg, topology, carrier);
+
+ GNUNET_free (section);
+ }
+
+ GNUNET_free (cfg);
+
+ return topology;
+}
+
+
/**
* Parse the topology data.
*
* @param data The topology data.
* @return The GNUNET_TESTING_NetjailTopology
- */
+ *
struct GNUNET_TESTING_NetjailTopology *
GNUNET_TESTING_get_topo_from_string_ (const char *input)
{
@@ -1072,7 +1328,7 @@ GNUNET_TESTING_get_topo_from_string_ (const char *input)
GNUNET_free (key);
GNUNET_free (data);
return topo;
-}
+}*/
GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (
diff --git a/src/lib/testing/testing_api_topology.h
b/src/lib/testing/testing_api_topology.h
index 7306f0728..7040ca286 100644
--- a/src/lib/testing/testing_api_topology.h
+++ b/src/lib/testing/testing_api_topology.h
@@ -189,7 +189,6 @@ struct GNUNET_TESTING_NetjailNode
unsigned int expected_reaches;
};
-
/**
* Subnet in a topology.
*/
@@ -211,20 +210,148 @@ struct GNUNET_TESTING_NetjailNamespace
struct GNUNET_CONTAINER_MultiShortmap *nodes;
};
+/**
+ * Backbone peer.
+ */
+struct GNUNET_TESTING_NetjailBackbonePeer
+{
+ /**
+ * Unique identifier this part of the topology can be identified.
+ */
+ unsigned int number;
+};
+
+/**
+ * Backbone peer.
+ */
+struct GNUNET_TESTING_NetjailCarrierPeer
+{
+ /**
+ * Unique identifier this part of the topology can be identified.
+ */
+ unsigned int number;
+};
+
+/**
+ * Carrier.
+ */
+struct GNUNET_TESTING_NetjailCarrier
+{
+ /**
+ * Unique identifier this part of the topology can be identified.
+ */
+ unsigned int number;
+
+ /**
+ * Of all carriers this has index.
+ */
+ unsigned int index;
+
+ /**
+ * Number of carrier peers.
+ */
+ unsigned int number_peers;
+
+ /**
+ * Number of carrier subnets.
+ */
+ unsigned int number_subnets;
+
+ /**
+ * Hash map containing subnets.
+ */
+ struct GNUNET_CONTAINER_MultiShortmap *subnets;
+
+ /**
+ * Hash map containing peers.
+ */
+ struct GNUNET_CONTAINER_MultiShortmap *peers;
+};
+
+/**
+ * Carrier subnet.
+ */
+struct GNUNET_TESTING_NetjailSubnet
+{
+ /**
+ * Unique identifier this part of the topology can be identified.
+ */
+ unsigned int number;
+
+ /**
+ * Of all subnets this has index.
+ */
+ unsigned int index;
+
+ /**
+ * Number of subnet peers.
+ */
+ unsigned int number_peers;
+
+ /**
+ * Hash map containing peers.
+ */
+ struct GNUNET_CONTAINER_MultiShortmap *peers;
+};
+
+/**
+ * Subnet peer.
+ */
+struct GNUNET_TESTING_NetjailSubnetPeer
+{
+ /**
+ * Unique identifier this part of the topology can be identified.
+ */
+ unsigned int number;
+};
+
/**
* Toplogy of our netjail setup.
*/
struct GNUNET_TESTING_NetjailTopology
{
+ /**
+ * Default number of subnets per carrier.
+ */
+ unsigned int default_subnets;
+
+ /**
+ * Default number of peers per carrier.
+ */
+ unsigned int default_carrier_peers;
+
+ /**
+ * Default number of peers per subnet.
+ */
+ unsigned int default_subnet_peers;
/**
* Default plugin for the test case to be run on nodes.
*/
char *plugin;
/**
- * Total number of namespaces in the topology;
- * numbered starting from 1 (!).
+ * Number of carriers.
+ */
+ unsigned int num_carriers;
+
+ /**
+ * Default number of backbone peers.
+ */
+ unsigned int num_backbone_peers;
+
+ /**
+ * Hash map containing the carriers.
+ */
+ struct GNUNET_CONTAINER_MultiShortmap *carriers;
+
+ /**
+ * Hash map containing the carriers.
+ */
+ struct GNUNET_CONTAINER_MultiShortmap *backbone_peers;
+
+ /**
+ * Total number of namespaces in the topology.
*/
unsigned int total;
diff --git a/src/service/transport/Makefile.am
b/src/service/transport/Makefile.am
index f6a1081d8..eac451882 100644
--- a/src/service/transport/Makefile.am
+++ b/src/service/transport/Makefile.am
@@ -28,7 +28,8 @@ lib_LTLIBRARIES = \
$(TESTING_LIBS)
libgnunettestingtransport_la_SOURCES = \
- testing_transport_traits.c transport-testing-cmds.h
+ testing_transport_traits.c transport-testing-cmds.h \
+ transport-testing-communicator.c transport-testing-communicator.h
# transport_api_cmd_connecting_peers.c \
# transport_api_cmd_backchannel_check.c \
# transport_api_cmd_send_simple.c \
@@ -38,8 +39,7 @@ libgnunettestingtransport_la_SOURCES = \
# transport-testing-filenames2.c \
# transport-testing-loggers2.c \
# transport-testing-main2.c \
-# transport-testing-send2.c \
-# transport-testing-communicator.c transport-testing-communicator.h
+# transport-testing-send2.c
libgnunettestingtransport_la_LIBADD = \
libgnunettransportapplication.la \
libgnunettransportcore.la \
@@ -49,7 +49,7 @@ libgnunettestingtransport_la_LIBADD = \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
$(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunettransporttesting2_la_LDFLAGS = \
+libgnunettestingtransport_la_LDFLAGS = \
$(GN_LIBINTL) \
$(GN_LIB_LDFLAGS) \
-version-info 0:0:0
@@ -196,7 +196,7 @@ gnunet_service_transport_LDADD = \
libgnunet_test_transport_plugin_cmd_nat_upnp_la_SOURCES = \
test_transport_plugin_cmd_nat_upnp.c
libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
@@ -212,7 +212,7 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LDFLAGS = \
libgnunet_test_transport_plugin_cmd_udp_backchannel_la_SOURCES = \
test_transport_plugin_cmd_udp_backchannel.c
libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
@@ -228,7 +228,7 @@
libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LDFLAGS = \
libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
test_transport_plugin_cmd_simple_send.c
libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
@@ -244,7 +244,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS
= \
libgnunet_test_transport_plugin_cmd_simple_send_performance_la_SOURCES = \
test_transport_plugin_cmd_simple_send_performance.c
libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
@@ -260,7 +260,7 @@
libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LDFLAGS = \
libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_SOURCES = \
test_transport_plugin_cmd_simple_send_broadcast.c
libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
@@ -276,7 +276,7 @@
libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LDFLAGS = \
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_SOURCES = \
test_transport_plugin_cmd_simple_send_dv.c
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
libgnunettransportapplication.la \
libgnunettransportcore.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
@@ -289,28 +289,28 @@
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
-#check_PROGRAMS = \
-# test_communicator_basic-tcp \
-# test_communicator_basic-udp \
-# test_communicator_rekey-tcp \
-# test_communicator_bidirect-tcp \
-# test_communicator_rekey-udp \
-# test_communicator_backchannel-udp
+check_PROGRAMS = \
+ test_communicator_basic-tcp \
+ test_communicator_basic-udp \
+ test_communicator_rekey-tcp \
+ test_communicator_bidirect-tcp \
+ test_communicator_rekey-udp \
+ test_communicator_backchannel-udp
if HAVE_EXPERIMENTAL
-#check_PROGRAMS += test_communicator_basic-quic \
-# test_communicator_basic-unix
-check_SCRIPTS= \
- test_transport_start_testcase.sh \
- test_transport_simple_send_performance.sh \
- test_transport_nat_icmp_tcp.sh \
- test_transport_nat_upnp.sh \
- test_transport_simple_send_string.sh \
- test_transport_simple_send.sh \
- test_transport_simple_send_broadcast.sh \
- test_transport_udp_backchannel.sh \
- test_transport_simple_send_dv_circle.sh \
- test_transport_simple_send_dv_inverse.sh
+check_PROGRAMS += test_communicator_basic-quic \
+ test_communicator_basic-unix
+# check_SCRIPTS= \
+ # test_transport_start_testcase.sh \
+ # test_transport_simple_send_performance.sh \
+ # test_transport_nat_icmp_tcp.sh \
+ # test_transport_nat_upnp.sh \
+ # test_transport_simple_send_string.sh \
+ # test_transport_simple_send.sh \
+ # test_transport_simple_send_broadcast.sh \
+ # test_transport_udp_backchannel.sh \
+ # test_transport_simple_send_dv_circle.sh \
+ # test_transport_simple_send_dv_inverse.sh
endif
if ENABLE_TEST_RUN
@@ -325,7 +325,7 @@ endif
test_communicator_basic_unix_SOURCES = \
test_communicator_basic.c
test_communicator_basic_unix_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -333,7 +333,7 @@ test_communicator_basic_unix_LDADD = \
test_communicator_basic_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_basic_tcp_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -341,7 +341,7 @@ test_communicator_basic_tcp_LDADD = \
test_communicator_basic_udp_SOURCES = \
test_communicator_basic.c
test_communicator_basic_udp_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -349,7 +349,7 @@ test_communicator_basic_udp_LDADD = \
test_communicator_basic_quic_SOURCES = \
test_communicator_basic.c
test_communicator_basic_quic_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -357,7 +357,7 @@ test_communicator_basic_quic_LDADD = \
test_communicator_rekey_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_rekey_tcp_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -365,7 +365,7 @@ test_communicator_rekey_tcp_LDADD = \
test_communicator_rekey_udp_SOURCES = \
test_communicator_basic.c
test_communicator_rekey_udp_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -373,7 +373,7 @@ test_communicator_rekey_udp_LDADD = \
test_communicator_backchannel_udp_SOURCES = \
test_communicator_basic.c
test_communicator_backchannel_udp_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -381,7 +381,7 @@ test_communicator_backchannel_udp_LDADD = \
test_communicator_bidirect_tcp_SOURCES = \
test_communicator_basic.c
test_communicator_bidirect_tcp_LDADD = \
- libgnunettransporttesting2.la \
+ libgnunettestingtransport.la \
$(top_builddir)/src/lib/testing/libgnunettesting.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
$(top_builddir)/src/service/statistics/libgnunetstatistics.la
@@ -391,7 +391,7 @@ test_transport_api2_tcp_SOURCES = \
test_transport_api2_tcp_LDADD = \
$(top_builddir)/src/lib/hello/libgnunethello.la \
$(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunettransporttesting2.la
+ libgnunettestingtransport.la
EXTRA_DIST = \
test_transport_start_testcase.sh \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (d4c4b1050 -> 361f1d528),
gnunet <=