[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 70/171: - merge with master
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 70/171: - merge with master |
|
Date: |
Thu, 04 Jan 2018 16:09:38 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit ab281595eeb270120f89ec954a572f4fcf78fc53
Merge: 59d393a11 2b87f173e
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Mar 29 14:26:33 2017 +0200
- merge with master
.gitignore | 4 +
AUTHORS | 3 +-
README | 4 +-
configure.ac | 32 +-
contrib/.gitignore | 2 +
contrib/Makefile.am | 2 +-
contrib/gnunet-gns-import.sh | 6 +-
contrib/gnunet-logread | 5 +-
contrib/vagrant/Vagrantfile | 55 +
contrib/vagrant/bootstrap.ubuntu.sh | 48 +
doc/.gitignore | 2 +
doc/gnunet-c-tutorial.pdf | Bin 395507 -> 293947
bytes
doc/gnunet-c-tutorial.tex | 652 +-
doc/man/gnunet-cadet.1 | 49 +-
doc/testbed_test.c | 112 +-
po/POTFILES.in | 33 +-
po/de.po | 973 +--
po/es.po | 972 +--
po/fr.po | 961 +--
po/sv.po | 968 +--
po/vi.po | 973 +--
po/zh_CN.po | 958 +--
src/Makefile.am | 14 +-
src/arm/Makefile.am | 2 +-
src/arm/arm_api.c | 2 +-
src/arm/gnunet-arm.c | 176 +-
src/arm/gnunet-service-arm.c | 5 +-
src/ats-tests/Makefile.am | 6 +-
src/ats-tests/gnunet-ats-sim.c | 14 +-
src/ats-tests/gnunet-solver-eval.c | 47 +-
src/ats-tests/template_perf_ats.conf | 4 +-
src/ats-tool/gnunet-ats.c | 84 +-
src/ats/.gitignore | 2 +
src/ats/Makefile.am | 14 +-
src/ats/ats_api_performance.c | 2 +-
src/ats/ats_api_scheduling.c | 6 +-
src/ats/gnunet-ats-solver-eval.c | 45 +-
src/ats/gnunet-service-ats_addresses.c | 2 +-
src/ats/gnunet-service-ats_performance.c | 2 +-
src/ats/perf_ats_solver.c | 57 +-
src/auction/Makefile.am | 62 +-
src/auction/gnunet-auction-create.c | 67 +-
src/block/Makefile.am | 23 +-
src/block/bg_bf.c | 268 +
src/block/block.c | 238 +-
src/block/plugin_block_template.c | 111 +-
src/block/plugin_block_test.c | 99 +-
src/cadet/.gitignore | 3 +
src/cadet/Makefile.am | 116 +-
src/cadet/TODO | 36 +
src/cadet/cadet.conf.in | 32 +-
src/cadet/cadet.h | 2 +-
src/cadet/cadet_api.c | 1794 +++---
src/cadet/cadet_common.c | 370 --
src/cadet/cadet_path.c | 363 --
src/cadet/cadet_path.h | 226 -
src/cadet/cadet_protocol.h | 193 +-
src/cadet/cadet_test_lib.c | 133 +-
src/cadet/cadet_test_lib.h | 40 +-
src/cadet/desirability_table.c | 35 +
src/cadet/gnunet-cadet-profiler.c | 4 +-
src/cadet/gnunet-cadet.c | 630 +-
src/cadet/gnunet-service-cadet-new.c | 1428 -----
src/cadet/gnunet-service-cadet-new_channel.c | 1613 -----
src/cadet/gnunet-service-cadet-new_channel.h | 249 -
src/cadet/gnunet-service-cadet-new_connection.c | 709 ---
src/cadet/gnunet-service-cadet-new_connection.h | 207 -
src/cadet/gnunet-service-cadet-new_dht.c | 351 --
src/cadet/gnunet-service-cadet-new_dht.h | 100 -
src/cadet/gnunet-service-cadet-new_hello.c | 152 -
src/cadet/gnunet-service-cadet-new_hello.h | 80 -
src/cadet/gnunet-service-cadet-new_peer.c | 1282 ----
src/cadet/gnunet-service-cadet-new_peer.h | 380 --
src/cadet/gnunet-service-cadet.c | 1488 ++++-
...-service-cadet-new.h => gnunet-service-cadet.h} | 53 +-
src/cadet/gnunet-service-cadet_channel.c | 3551 +++++------
src/cadet/gnunet-service-cadet_channel.h | 393 +-
src/cadet/gnunet-service-cadet_connection.c | 4104 +++----------
src/cadet/gnunet-service-cadet_connection.h | 605 +-
...adet-new_core.c => gnunet-service-cadet_core.c} | 606 +-
...adet-new_core.h => gnunet-service-cadet_core.h} | 0
src/cadet/gnunet-service-cadet_dht.c | 373 +-
src/cadet/gnunet-service-cadet_dht.h | 49 +-
src/cadet/gnunet-service-cadet_hello.c | 140 +-
src/cadet/gnunet-service-cadet_hello.h | 5 +-
src/cadet/gnunet-service-cadet_local.c | 1553 -----
src/cadet/gnunet-service-cadet_local.h | 234 -
...et-new_paths.c => gnunet-service-cadet_paths.c} | 119 +-
...et-new_paths.h => gnunet-service-cadet_paths.h} | 2 +-
src/cadet/gnunet-service-cadet_peer.c | 2990 ++++------
src/cadet/gnunet-service-cadet_peer.h | 516 +-
src/cadet/gnunet-service-cadet_tunnel.c | 3501 -----------
src/cadet/gnunet-service-cadet_tunnel.h | 616 --
...ew_tunnels.c => gnunet-service-cadet_tunnels.c} | 1794 ++++--
...ew_tunnels.h => gnunet-service-cadet_tunnels.h} | 85 +-
src/cadet/test_cadet.c | 819 ++-
src/cadet/test_cadet_local.c | 351 --
src/cadet/test_cadet_local_mq.c | 332 ++
src/cadet/test_cadet_single.c | 354 --
src/consensus/.gitignore | 2 +
src/consensus/Makefile.am | 27 +-
src/consensus/consensus_protocol.h | 57 +-
src/consensus/gnunet-consensus-profiler.c | 120 +-
src/consensus/gnunet-service-consensus.c | 775 ++-
src/consensus/plugin_block_consensus.c | 137 +
src/consensus/test_consensus.conf | 19 +-
src/conversation/.gitignore | 3 +
src/conversation/Makefile.am | 4 +-
src/conversation/conversation_api_call.c | 1 -
src/conversation/gnunet-conversation.c | 21 +-
.../gnunet-helper-audio-playback-gst.c | 69 +-
src/conversation/gnunet-helper-audio-playback.c | 15 +-
src/conversation/gnunet-helper-audio-record-gst.c | 9 +-
src/conversation/gnunet-service-conversation.c | 505 +-
src/conversation/gnunet_gst.c | 54 +-
src/conversation/gnunet_gst_def.h | 13 +-
src/conversation/gnunet_gst_test.c | 7 +-
src/conversation/microphone.c | 2 -
src/conversation/test_conversation.conf | 1 +
src/conversation/test_conversation_api_twocalls.c | 3 +-
src/core/Makefile.am | 2 +-
src/core/core_api.c | 29 +-
src/core/gnunet-core.c | 9 +-
src/core/gnunet-service-core.c | 69 +-
src/core/gnunet-service-core_kx.c | 171 +-
src/core/gnunet-service-core_sessions.c | 96 +-
src/core/gnunet-service-core_typemap.c | 21 +-
src/datacache/Makefile.am | 3 +-
src/datacache/plugin_datacache_sqlite.c | 550 +-
src/datastore/Makefile.am | 3 +-
src/datastore/datastore.h | 53 +-
src/datastore/datastore_api.c | 179 +-
src/datastore/gnunet-datastore.c | 50 +-
src/datastore/gnunet-service-datastore.c | 125 +-
src/datastore/perf_datastore_api.c | 2 +
src/datastore/perf_plugin_datastore.c | 33 +-
src/datastore/plugin_datastore_heap.c | 301 +-
src/datastore/plugin_datastore_mysql.c | 311 +-
src/datastore/plugin_datastore_postgres.c | 373 +-
src/datastore/plugin_datastore_sqlite.c | 892 +--
src/datastore/plugin_datastore_template.c | 47 +-
src/datastore/test_datastore_api.c | 95 +-
src/datastore/test_datastore_api_management.c | 63 +-
src/datastore/test_plugin_datastore.c | 14 +-
src/dht/.gitignore | 2 -
src/dht/Makefile.am | 49 +-
src/dht/dht_api.c | 37 +-
src/dht/gnunet-dht-get.c | 99 +-
src/dht/gnunet-dht-monitor.c | 50 +-
src/dht/gnunet-dht-put.c | 123 +-
src/dht/gnunet-service-dht_clients.c | 35 +-
src/dht/gnunet-service-dht_datacache.c | 46 +-
src/dht/gnunet-service-dht_datacache.h | 6 +-
src/dht/gnunet-service-dht_neighbours.c | 519 +-
src/dht/gnunet-service-dht_neighbours.h | 14 +-
src/dht/gnunet-service-dht_routing.c | 83 +-
src/dht/gnunet-service-dht_routing.h | 19 +-
src/dht/gnunet-service-wdht.c | 103 -
src/dht/gnunet-service-wdht.h | 50 -
src/dht/gnunet-service-wdht_clients.c | 1428 -----
src/dht/gnunet-service-wdht_neighbours.c | 1768 ------
src/dht/gnunet-service-xdht.c | 121 -
src/dht/gnunet-service-xdht.h | 50 -
src/dht/gnunet-service-xdht_hello.c | 137 -
src/dht/gnunet-service-xdht_hello.h | 55 -
src/dht/gnunet-service-xdht_neighbours.c | 6265 --------------------
src/dht/gnunet-service-xdht_neighbours.h | 47 -
src/dht/gnunet-service-xdht_routing.c | 368 --
src/dht/gnunet-service-xdht_routing.h | 141 -
src/dht/gnunet_dht_profiler.c | 73 +-
src/dht/plugin_block_dht.c | 95 +-
src/dht/test_dht_api.c | 180 +-
src/dht/test_dht_monitor.c | 42 +-
src/dht/test_dht_tools.py.in | 16 +-
src/dns/Makefile.am | 3 +-
src/dns/dns_api.c | 2 +-
src/dns/gnunet-dns-monitor.c | 23 +-
src/dns/gnunet-dns-redirector.c | 24 +-
src/dns/gnunet-helper-dns.c | 4 +-
src/dns/gnunet-service-dns.c | 7 +-
src/dns/plugin_block_dns.c | 82 +-
src/dv/Makefile.am | 2 +-
src/dv/dv_api.c | 2 +-
src/dv/gnunet-dv.c | 10 +-
src/dv/gnunet-service-dv.c | 8 +-
src/exit/Makefile.am | 6 +-
src/exit/gnunet-daemon-exit.c | 3155 +++++-----
src/exit/gnunet-helper-exit-windows.c | 2 +-
src/exit/gnunet-helper-exit.c | 2 +-
src/fragmentation/Makefile.am | 2 +-
src/fs/.gitignore | 32 +
src/fs/Makefile.am | 3 +-
src/fs/fs.conf.in | 2 +-
src/fs/fs_api.c | 28 +-
src/fs/fs_api.h | 10 -
src/fs/fs_directory.c | 78 +-
src/fs/fs_dirmetascan.c | 2 -
src/fs/fs_download.c | 156 +-
src/fs/fs_getopt.c | 79 +-
src/fs/fs_publish.c | 4 +-
src/fs/fs_search.c | 65 +-
src/fs/fs_tree.c | 6 +-
src/fs/fs_unindex.c | 61 +-
src/fs/fs_uri.c | 22 +-
src/fs/gnunet-auto-share.c | 54 +-
src/fs/gnunet-download.c | 74 +-
src/fs/gnunet-fs-profiler.c | 30 +-
src/fs/gnunet-fs.c | 15 +-
src/fs/gnunet-helper-fs-publish.c | 2 +-
src/fs/gnunet-publish.c | 151 +-
src/fs/gnunet-search.c | 58 +-
src/fs/gnunet-service-fs.c | 5 +-
src/fs/gnunet-service-fs_cadet.h | 49 +-
src/fs/gnunet-service-fs_cadet_client.c | 584 +-
src/fs/gnunet-service-fs_cadet_server.c | 328 +-
src/fs/gnunet-service-fs_cp.c | 4 +-
src/fs/gnunet-service-fs_indexing.c | 5 +-
src/fs/gnunet-service-fs_indexing.h | 11 +-
src/fs/gnunet-service-fs_lc.c | 33 -
src/fs/gnunet-service-fs_lc.h | 33 -
src/fs/gnunet-service-fs_pr.c | 561 +-
src/fs/gnunet-service-fs_push.c | 6 +-
src/fs/gnunet-service-fs_put.c | 46 +-
src/fs/gnunet-unindex.c | 10 +-
src/fs/plugin_block_fs.c | 105 +-
src/fs/test_plugin_block_fs.c | 6 +-
src/gns/Makefile.am | 23 +-
src/gns/gns.h | 53 +-
src/gns/gns_api.c | 196 +-
src/gns/gnunet-bcd.c | 12 +-
src/gns/gnunet-dns2gns.c | 67 +-
src/gns/gnunet-gns-helper-service-w32.c | 517 +-
src/gns/gnunet-gns-import.c | 71 +-
src/gns/gnunet-gns-proxy.c | 129 +-
src/gns/gnunet-gns.c | 218 +-
src/gns/gnunet-service-gns.c | 199 +-
src/gns/gnunet-service-gns_interceptor.c | 1 -
src/gns/gnunet-service-gns_resolver.c | 36 +-
src/gns/gnunet-service-gns_resolver.h | 11 +-
src/gns/gnunet-service-gns_reverser.c | 601 --
src/gns/gnunet-service-gns_reverser.h | 91 -
src/gns/gnunet-service-gns_shorten.c | 466 --
src/gns/gnunet-service-gns_shorten.h | 70 -
src/gns/plugin_block_gns.c | 97 +-
src/gns/plugin_gnsrecord_gns.c | 18 +-
src/gns/plugin_rest_gns.c | 55 +-
src/gns/test_gns_nick_shorten.sh | 124 -
src/gns/test_gns_reverse_lookup.sh | 50 -
src/gns/w32nsp-resolve.c | 3 +
src/gnsrecord/Makefile.am | 2 +-
src/hello/Makefile.am | 2 +-
src/hello/hello.c | 2 +-
src/hostlist/Makefile.am | 2 +-
src/hostlist/gnunet-daemon-hostlist.c | 31 +-
src/hostlist/gnunet-daemon-hostlist_client.c | 6 +-
src/hostlist/gnunet-daemon-hostlist_server.c | 2 +-
src/identity-provider/gnunet-identity-token.c | 19 +-
.../gnunet-service-identity-provider.c | 8 +-
src/identity-provider/identity_provider_api.c | 2 +-
.../plugin_rest_identity_provider.c | 3 +
src/identity/Makefile.am | 2 +-
src/identity/gnunet-identity.c | 116 +-
src/identity/identity_api.c | 14 +-
src/include/Makefile.am | 3 +-
src/include/gnunet_arm_service.h | 18 +-
src/include/gnunet_bandwidth_lib.h | 14 +-
src/include/gnunet_block_group_lib.h | 114 +
src/include/gnunet_block_lib.h | 117 +-
src/include/gnunet_block_plugin.h | 139 +-
src/include/gnunet_cadet_service.h | 544 +-
src/include/gnunet_common.h | 2 +-
src/include/gnunet_configuration_lib.h | 7 +-
src/include/gnunet_connection_lib.h | 400 --
src/include/gnunet_constants.h | 2 +
src/include/gnunet_container_lib.h | 53 +
src/include/gnunet_core_service.h | 53 +-
src/include/gnunet_credential_service.h | 2 -
src/include/gnunet_crypto_lib.h | 11 +
src/include/gnunet_datastore_plugin.h | 89 +-
src/include/gnunet_datastore_service.h | 49 +-
src/include/gnunet_fs_service.h | 47 +-
src/include/gnunet_getopt_lib.h | 349 +-
src/include/gnunet_gns_service.h | 44 +-
src/include/gnunet_helper_lib.h | 8 +-
src/include/gnunet_json_lib.h | 20 +
src/include/gnunet_mq_lib.h | 90 +-
src/include/gnunet_multicast_service.h | 4 +
src/include/gnunet_mysql_lib.h | 14 +-
src/include/gnunet_network_lib.h | 12 +
src/include/gnunet_os_lib.h | 3 +-
src/include/gnunet_peerstore_service.h | 4 +-
src/include/gnunet_plugin_lib.h | 2 +-
src/include/gnunet_pq_lib.h | 20 +-
src/include/gnunet_protocols.h | 43 +-
src/include/gnunet_scheduler_lib.h | 246 +-
src/include/gnunet_server_lib.h | 887 ---
src/include/gnunet_service_lib.h | 107 +-
src/include/gnunet_set_service.h | 61 +-
src/include/{gnunet_pq_lib.h => gnunet_sq_lib.h} | 240 +-
src/include/gnunet_strings_lib.h | 14 +-
src/include/gnunet_util_lib.h | 17 +-
src/include/platform.h | 1 +
src/integration-tests/.gitignore | 8 +
src/integration-tests/Makefile.am | 2 +-
src/integration-tests/confs/test_defaults.conf | 4 +-
src/json/json.c | 73 +-
src/multicast/.gitignore | 3 +
src/multicast/Makefile.am | 15 +-
src/multicast/gnunet-service-multicast.c | 953 +--
src/multicast/test_multicast.c | 9 +
src/multicast/test_multicast.conf | 10 +-
src/multicast/test_multicast_2peers.c | 511 ++
src/multicast/test_multicast_multipeer.c | 430 +-
src/namecache/.gitignore | 1 +
src/namecache/Makefile.am | 4 +-
src/namecache/gnunet-namecache.c | 20 +-
src/namecache/plugin_namecache_sqlite.c | 215 +-
src/namestore/.gitignore | 31 +-
src/namestore/Makefile.am | 114 +-
src/namestore/gnunet-namestore.c | 125 +-
src/namestore/gnunet-service-namestore.c | 2 +-
src/namestore/plugin_namestore_sqlite.c | 394 +-
src/namestore/plugin_rest_namestore.c | 11 +-
src/namestore/test_namestore_api_remove.c | 18 +-
src/nat-auto/Makefile.am | 5 +-
src/nat-auto/gnunet-nat-auto.c | 69 +-
src/nat-auto/gnunet-nat-server.c | 216 +-
src/nat-auto/nat_auto_api.c | 8 +-
src/nat-auto/nat_auto_api_test.c | 20 +-
src/nat/Makefile.am | 2 +-
src/nat/gnunet-helper-nat-client-windows.c | 2 +
src/nat/gnunet-helper-nat-server-windows.c | 2 +
src/nat/gnunet-nat.c | 139 +-
src/nat/gnunet-service-nat.c | 70 +-
src/nat/gnunet-service-nat_externalip.c | 18 +-
src/nat/gnunet-service-nat_helper.c | 29 +-
src/nat/gnunet-service-nat_mini.c | 16 +-
src/nat/nat_api.c | 30 +-
src/nat/nat_stun.h | 15 +-
src/nse/Makefile.am | 2 +-
src/nse/gnunet-nse-profiler.c | 65 +-
src/peerinfo-tool/Makefile.am | 2 +-
src/peerinfo-tool/gnunet-peerinfo.c | 67 +-
src/peerinfo/.gitignore | 1 +
src/peerinfo/Makefile.am | 2 +-
src/peerinfo/gnunet-service-peerinfo.c | 8 +-
src/peerinfo/perf_peerinfo_api.c | 93 +-
src/peerstore/.gitignore | 1 +
src/peerstore/Makefile.am | 6 +-
src/peerstore/gnunet-service-peerstore.c | 32 +-
src/peerstore/peerstore.h | 2 +-
src/peerstore/peerstore_api.c | 27 +-
src/peerstore/peerstore_common.c | 20 +-
src/peerstore/peerstore_common.h | 2 +-
src/peerstore/plugin_peerstore_flat.c | 49 +-
src/peerstore/plugin_peerstore_sqlite.c | 464 +-
src/peerstore/test_peerstore_api_iterate.c | 73 +-
src/peerstore/test_peerstore_api_store.c | 55 +-
src/peerstore/test_plugin_peerstore.c | 127 +-
src/postgres/postgres.c | 28 +-
src/pq/pq.c | 7 +-
src/pq/pq_result_helper.c | 50 +-
src/pq/test_pq.c | 6 +-
src/psyc/.gitignore | 1 +
src/psyc/Makefile.am | 2 +-
src/psyc/gnunet-service-psyc.c | 3 +
src/psyc/psyc_api.c | 4 +-
src/psycstore/.gitignore | 4 +
src/psycstore/Makefile.am | 7 +-
src/psycstore/gnunet-service-psycstore.c | 2 +-
src/psycstore/psycstore_api.c | 4 +-
src/psycutil/.gitignore | 1 +
src/psycutil/Makefile.am | 2 +-
src/pt/.gitignore | 5 +
src/pt/Makefile.am | 2 +-
src/pt/gnunet-daemon-pt.c | 461 +-
src/pt/test_gns_vpn.c | 251 +-
src/pt/test_gns_vpn.conf | 4 +
src/regex/Makefile.am | 3 +-
src/regex/gnunet-regex-profiler.c | 49 +-
src/regex/gnunet-regex-simulation-profiler.c | 21 +-
src/regex/gnunet-service-regex.c | 323 +-
src/regex/plugin_block_regex.c | 146 +-
src/regex/regex_api_announce.c | 2 +-
src/regex/regex_api_search.c | 2 +-
src/rest/gnunet-rest-server.c | 14 +-
src/revocation/.gitignore | 2 +
src/revocation/Makefile.am | 19 +-
src/revocation/gnunet-revocation.c | 38 +-
src/revocation/gnunet-service-revocation.c | 20 +-
src/revocation/plugin_block_revocation.c | 257 +
src/revocation/revocation_api.c | 4 +-
src/revocation/test_local_revocation.py.in | 4 +
src/revocation/test_revocation.c | 20 +-
src/rps/Makefile.am | 36 +-
src/rps/gnunet-rps.c | 57 +-
src/rps/gnunet-service-rps.c | 226 +-
src/rps/gnunet-service-rps_peers.c | 96 +-
src/rps/gnunet-service-rps_peers.h | 37 +-
src/rps/rps_api.c | 8 +-
src/rps/test_rps.c | 6 +-
src/rps/test_service_rps_peers.c | 8 +-
src/scalarproduct/.gitignore | 1 +
src/scalarproduct/Makefile.am | 2 +-
src/scalarproduct/gnunet-scalarproduct.c | 36 +-
.../gnunet-service-scalarproduct-ecc_alice.c | 131 +-
.../gnunet-service-scalarproduct-ecc_bob.c | 458 +-
.../gnunet-service-scalarproduct_alice.c | 214 +-
.../gnunet-service-scalarproduct_bob.c | 422 +-
src/scalarproduct/scalarproduct_api.c | 8 +-
src/scalarproduct/test_scalarproduct.conf | 3 -
src/secretsharing/.gitignore | 1 +
src/secretsharing/Makefile.am | 11 +-
src/secretsharing/gnunet-secretsharing-profiler.c | 59 +-
src/secretsharing/gnunet-service-secretsharing.c | 538 +-
src/set/.gitignore | 4 +
src/set/Makefile.am | 20 +-
src/set/gnunet-service-set.c | 1936 +++---
src/set/gnunet-service-set.h | 346 +-
src/set/gnunet-service-set_intersection.c | 652 +-
src/set/gnunet-service-set_intersection.h | 79 +
src/set/gnunet-service-set_protocol.h | 14 +
src/set/gnunet-service-set_union.c | 1310 ++--
src/set/gnunet-service-set_union.h | 239 +
src/set/gnunet-set-ibf-profiler.c | 49 +-
src/set/gnunet-set-profiler.c | 163 +-
.../plugin_block_set_test.c} | 70 +-
src/set/set.conf.in | 2 +-
src/set/set.h | 53 +
src/set/set_api.c | 126 +-
src/set/test_set.conf | 1 -
src/set/test_set_api.c | 81 +-
src/set/test_set_intersection_result_full.c | 97 +-
src/set/test_set_union_copy.c | 70 +-
src/set/test_set_union_result_symmetric.c | 4 +
src/social/.gitignore | 1 +
src/social/Makefile.am | 2 +-
src/social/gnunet-service-social.c | 8 +-
src/social/gnunet-social.c | 316 +-
src/social/social_api.c | 10 +-
src/sq/.gitignore | 1 +
src/sq/Makefile.am | 40 +
src/sq/sq.c | 140 +
src/sq/sq_query_helper.c | 493 ++
src/sq/sq_result_helper.c | 782 +++
src/sq/test_sq.c | 285 +
src/statistics/Makefile.am | 2 +-
src/statistics/gnunet-service-statistics.c | 9 +-
src/statistics/gnunet-statistics.c | 60 +-
src/statistics/statistics_api.c | 6 +-
src/template/Makefile.am | 2 +-
src/testbed-logger/Makefile.am | 2 +-
src/testbed-logger/gnunet-service-testbed-logger.c | 179 +-
src/testbed-logger/test_testbed_logger_api.c | 4 +
src/testbed-logger/testbed_logger_api.c | 2 +-
src/testbed/Makefile.am | 6 +-
src/testbed/generate-underlay-topology.c | 12 +-
src/testbed/gnunet-helper-testbed.c | 2 +-
src/testbed/gnunet-service-testbed_barriers.c | 4 +-
src/testbed/gnunet-service-testbed_oc.c | 2 +-
src/testbed/gnunet-service-testbed_peers.c | 6 -
src/testbed/gnunet-testbed-profiler.c | 43 +-
src/testbed/test_gnunet_helper_testbed.c | 18 +-
src/testbed/testbed_api_hosts.c | 5 +-
src/testbed/testbed_api_peers.c | 2 +-
src/testbed/testbed_api_test.c | 18 +-
src/testbed/testbed_api_topology.c | 8 +-
src/testing/Makefile.am | 2 +-
src/testing/gnunet-testing.c | 40 +-
src/testing/list-keys.c | 15 +-
src/testing/testing.c | 5 +-
src/topology/Makefile.am | 2 +-
src/topology/friends.c | 18 +-
src/topology/gnunet-daemon-topology.c | 2 +-
src/transport/Makefile.am | 6 +-
src/transport/gnunet-helper-transport-wlan-dummy.c | 30 +-
src/transport/gnunet-service-transport.c | 41 +-
.../gnunet-service-transport_neighbours.c | 38 +-
.../gnunet-service-transport_validation.c | 2 +-
.../gnunet-transport-certificate-creation.c | 2 +-
src/transport/gnunet-transport-profiler.c | 56 +-
src/transport/gnunet-transport.c | 122 +-
src/transport/plugin_transport_http_client.c | 25 +-
src/transport/plugin_transport_http_server.c | 25 +-
src/transport/plugin_transport_tcp.c | 679 ++-
src/transport/plugin_transport_udp.c | 58 +-
src/transport/plugin_transport_udp.h | 12 +-
src/transport/plugin_transport_udp_broadcasting.c | 30 +-
src/transport/plugin_transport_unix.c | 6 +-
src/transport/plugin_transport_wlan.c | 31 +-
.../tcp_connection_legacy.c} | 41 +-
.../server.c => transport/tcp_server_legacy.c} | 24 +-
.../tcp_server_mst_legacy.c} | 6 +-
.../service.c => transport/tcp_service_legacy.c} | 101 +-
src/transport/test_plugin_transport.c | 2 +-
src/transport/test_transport_address_switch.c | 11 +-
src/transport/test_transport_api_reliability.c | 14 +-
src/transport/transport-testing-loggers.c | 1 +
src/transport/transport-testing-main.c | 22 +-
src/transport/transport-testing.c | 26 +-
src/transport/transport.conf.in | 17 +-
src/transport/transport_api_address_to_string.c | 6 +-
src/transport/transport_api_core.c | 5 +-
src/tun/Makefile.am | 2 +-
src/util/.gitignore | 4 +
src/util/Makefile.am | 107 +-
src/util/bandwidth.c | 20 +-
src/util/bio.c | 2 +-
src/util/client.c | 28 +-
src/util/common_allocation.c | 4 +-
src/util/common_endian.c | 2 +-
src/util/configuration_loader.c | 2 +-
src/util/container_bloomfilter.c | 6 +-
src/util/container_heap.c | 2 +-
src/util/container_meta_data.c | 2 +-
src/util/container_multihashmap.c | 2 +-
src/util/container_multihashmap32.c | 2 +-
src/util/container_multipeermap.c | 2 +-
src/util/container_multishortmap.c | 2 +-
src/util/crypto_crc.c | 2 +-
src/util/crypto_ecc.c | 41 +-
src/util/crypto_ecc_setup.c | 6 +-
src/util/crypto_hash.c | 4 +-
src/util/crypto_hash_file.c | 4 +-
src/util/crypto_hkdf.c | 2 +-
src/util/crypto_kdf.c | 2 +-
src/util/crypto_mpi.c | 2 +-
src/util/crypto_random.c | 4 +-
src/util/crypto_rsa.c | 38 +-
src/util/crypto_symmetric.c | 2 +-
src/util/disk.c | 29 +-
src/util/getopt.c | 76 +-
src/util/getopt_helpers.c | 636 +-
src/util/gnunet-config.c | 58 +-
src/util/gnunet-ecc.c | 56 +-
src/util/gnunet-resolver.c | 9 +-
src/util/gnunet-scrypt.c | 41 +-
src/util/helper.c | 25 +-
src/util/load.c | 2 +-
src/util/mq.c | 322 +-
src/util/mst.c | 14 +-
src/util/network.c | 64 +-
src/util/os_installation.c | 53 +-
src/util/os_network.c | 6 +-
src/util/os_priority.c | 17 +-
src/util/peer.c | 2 +-
src/util/plugin.c | 2 +-
src/util/program.c | 14 +-
src/util/resolver_api.c | 10 +-
src/util/scheduler.c | 328 +-
src/util/server_nc.c | 472 --
src/util/server_tc.c | 242 -
src/util/service.c | 2455 +++++---
src/util/service_new.c | 2617 --------
src/util/signal.c | 2 +-
src/util/socks.c | 88 +-
src/util/speedup.c | 2 +-
src/util/strings.c | 38 +-
src/util/test_client.c | 2 +-
src/util/test_common_allocation.c | 73 +-
src/util/test_connection.c | 167 -
src/util/test_connection_addressing.c | 186 -
src/util/test_connection_receive_cancel.c | 160 -
src/util/test_connection_timeout.c | 129 -
src/util/test_connection_timeout_no_connect.c | 76 -
src/util/test_connection_transmit_cancel.c | 76 -
src/util/test_container_dll.c | 112 +
src/util/test_container_meta_data.c | 34 +-
src/util/test_getopt.c | 53 +-
src/util/test_program.c | 129 +-
src/util/test_server.c | 302 -
src/util/test_server_disconnect.c | 166 -
src/util/test_server_mst_interrupt.c | 60 -
src/util/test_server_with_client.c | 198 -
src/util/test_server_with_client_unix.c | 176 -
src/util/test_service.c | 2 +-
src/util/time.c | 2 +-
src/util/util.conf | 5 +-
src/util/win.c | 10 +-
src/util/winproc.c | 2 +-
src/vpn/Makefile.am | 2 -
src/vpn/gnunet-helper-vpn-windows.c | 2 +-
src/vpn/gnunet-helper-vpn.c | 2 +-
src/vpn/gnunet-service-vpn.c | 3156 +++++-----
src/vpn/gnunet-vpn.c | 76 +-
585 files changed, 40003 insertions(+), 65362 deletions(-)
diff --cc src/identity-provider/plugin_rest_identity_provider.c
index cd0c76989,907b28ba9..5ea7b2821
--- a/src/identity-provider/plugin_rest_identity_provider.c
+++ b/src/identity-provider/plugin_rest_identity_provider.c
@@@ -602,9 -580,10 +602,10 @@@ issue_token_cont (struct GNUNET_REST_Re
}
nonce_str = GNUNET_CONTAINER_multihashmap_get
(handle->conndata_handle->url_param_map,
&key);
+ GNUNET_assert (NULL != nonce_str);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Request nonce: %s\n",
- nonce_str);
+ "Request nonce: %s\n",
+ nonce_str);
GNUNET_assert (1 == sscanf (nonce_str, "%"SCNu64, &nonce));
//Get expiration for token from URL parameter
@@@ -888,7 -867,8 +890,8 @@@ exchange_cont (void *cls
return;
}
nonce_str = GNUNET_CONTAINER_multihashmap_get
(handle->conndata_handle->url_param_map,
- &key);
+ &key);
+ GNUNET_assert (NULL != nonce_str);
GNUNET_assert (1 == sscanf (nonce_str, "%"SCNu64, &expected_nonce));
if (ticket_nonce != expected_nonce)
diff --cc src/include/gnunet_credential_service.h
index d04c0a253,9e765c12b..6c9b477ea
--- a/src/include/gnunet_credential_service.h
+++ b/src/include/gnunet_credential_service.h
@@@ -227,56 -75,26 +227,54 @@@ GNUNET_CREDENTIAL_disconnect (struct GN
/**
- * Iterator called on obtained result for a Credential lookup.
+ * Iterator called on obtained result for an attribute verification.
*
* @param cls closure
- * @param issuer the issuer chain
- * @param issuer_len length of issuer chain
- * @param value the value returned
+ * @param d_count the number of delegations processed
+ * @param delegation_chain the delegations processed
+ * @param c_count the number of credentials found
+ * @param credential the credentials
*/
-typedef void
-(*GNUNET_CREDENTIAL_LookupResultProcessor) (void *cls,
- struct GNUNET_IDENTITY_Ego
*issuer,
- uint16_t issuer_len,
- const struct
GNUNET_CREDENTIAL_Value *value);
+typedef void (*GNUNET_CREDENTIAL_CredentialResultProcessor) (void *cls,
+ unsigned int d_count,
+ struct
GNUNET_CREDENTIAL_Delegation *delegation_chain,
+ unsigned int c_count,
+ struct
GNUNET_CREDENTIAL_Credential *credential);
+/**
+ * Iterator called on obtained result for an attribute delegation.
+ *
+ * @param cls closure
+ * @param success GNUNET_YES if successful
+ * @param result the record data that can be handed to the subject
+ */
+typedef void (*GNUNET_CREDENTIAL_DelegateResultProcessor) (void *cls,
+ uint32_t success);
/**
- * Perform an asynchronous lookup operation for a credential.
+ * Iterator called on obtained result for an attribute delegation removal.
+ *
+ * @param cls closure
+ * @param success GNUNET_YES if successful
+ * @param result the record data that can be handed to the subject
+ */
+typedef void (*GNUNET_CREDENTIAL_RemoveDelegateResultProcessor) (void *cls,
+ uint32_t
success);
+
+
-
-
+/**
+ * Performs attribute verification.
+ * Checks if there is a delegation chain from
+ * attribute ``issuer_attribute'' issued by the issuer
+ * with public key ``issuer_key'' maps to the attribute
+ * ``subject_attribute'' claimed by the subject with key
+ * ``subject_key''
*
* @param handle handle to the Credential service
- * @param credential the credential to look up
- * @param subject Ego to check the credential for
+ * @param issuer_key the issuer public key
+ * @param issuer_attribute the issuer attribute
+ * @param subject_key the subject public key
+ * @param subject_attribute the attribute claimed by the subject
* @param proc function to call on result
* @param proc_cls closure for processor
* @return handle to the queued request
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 71/171: Merge remote-tracking branch 'origin/master' into credentials, (continued)
- [GNUnet-SVN] [gnunet] 71/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 79/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 78/171: -fix idp, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 72/171: -fix API changes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 76/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 89/171: Merge branch 'abe' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 104/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 94/171: -add CLI, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 87/171: -towards IdP2, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 62/171: -change api, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 70/171: - merge with master,
gnunet <=
- [GNUnet-SVN] [gnunet] 101/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 107/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 100/171: -merge, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 103/171: Merge branch 'abe' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 112/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 99/171: -add free ABE functions, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 90/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 125/171: -do not persist sensitive data, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 95/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 106/171: -fixes, gnunet, 2018/01/04