[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/07: Merge branch 'master' of ssh://gnunet.org/g
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 03/07: Merge branch 'master' of ssh://gnunet.org/gnunet |
|
Date: |
Wed, 08 Mar 2017 23:41:23 +0100 |
This is an automated email from the git hooks/post-receive script.
xrs pushed a commit to branch master
in repository gnunet.
commit f82b3a27df765f4a31548ae4efe66dc3dbc42cef
Merge: b0042448a a9a6b98c5
Author: xrs <address@hidden>
AuthorDate: Tue Feb 28 19:37:43 2017 +0100
Merge branch 'master' of ssh://gnunet.org/gnunet
Conflicts:
src/multicast/test_multicast_multipeer.c
configure.ac | 12 +-
contrib/.gitignore | 1 +
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 -> 262596
bytes
doc/gnunet-c-tutorial.tex | 434 +-
po/POTFILES.in | 14 +-
src/Makefile.am | 14 +-
src/ats-tests/Makefile.am | 4 +-
src/ats/.gitignore | 2 +
src/ats/Makefile.am | 12 +-
src/block/Makefile.am | 2 +
src/block/bg_bf.c | 32 +
src/block/block.c | 35 +-
src/block/plugin_block_template.c | 25 +-
src/block/plugin_block_test.c | 21 +-
src/cadet/Makefile.am | 18 +-
src/cadet/cadet_api_new.c | 27 +-
src/cadet/gnunet-cadet-profiler.c | 4 +-
src/cadet/gnunet-service-cadet-new.c | 26 +-
src/cadet/gnunet-service-cadet-new_channel.c | 10 +-
src/cadet/gnunet-service-cadet-new_peer.c | 70 +-
src/cadet/gnunet-service-cadet-new_tunnels.c | 34 +-
src/consensus/.gitignore | 1 +
src/consensus/Makefile.am | 20 +
src/consensus/consensus_protocol.h | 43 +
src/consensus/gnunet-consensus-profiler.c | 52 +-
src/consensus/gnunet-service-consensus.c | 251 +-
src/consensus/plugin_block_consensus.c | 137 +
src/consensus/test_consensus.conf | 19 +-
src/conversation/conversation_api_call.c | 1 -
src/conversation/gnunet_gst_def.h | 11 +-
src/core/gnunet-service-core.c | 56 +-
src/core/gnunet-service-core_kx.c | 4 +-
src/datastore/datastore_api.c | 13 +-
src/datastore/gnunet-service-datastore.c | 8 +-
src/datastore/plugin_datastore_sqlite.c | 52 +-
src/datastore/test_datastore_api_management.c | 19 +-
src/dht/.gitignore | 2 -
src/dht/Makefile.am | 47 -
src/dht/dht_api.c | 21 +-
src/dht/gnunet-service-dht_clients.c | 5 +-
src/dht/gnunet-service-dht_neighbours.c | 360 +-
src/dht/gnunet-service-dht_routing.c | 8 +-
src/dht/gnunet-service-dht_routing.h | 8 +-
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/plugin_block_dht.c | 32 +-
src/dht/test_dht_api.c | 180 +-
src/dht/test_dht_monitor.c | 42 +-
src/dns/plugin_block_dns.c | 68 +-
src/dv/gnunet-service-dv.c | 4 +
src/exit/Makefile.am | 8 +-
src/exit/gnunet-daemon-exit.c | 3151 +++++-----
src/fs/.gitignore | 1 +
src/fs/fs.conf.in | 2 +-
src/fs/fs_search.c | 2 +-
src/fs/gnunet-service-fs.c | 2 +-
src/fs/gnunet-service-fs_pr.c | 10 +-
src/fs/plugin_block_fs.c | 48 +-
src/gns/Makefile.am | 20 +-
src/gns/gns.h | 53 +-
src/gns/gns_api.c | 194 +-
src/gns/gnunet-dns2gns.c | 19 +-
src/gns/gnunet-gns-helper-service-w32.c | 517 +-
src/gns/gnunet-gns-import.c | 71 +-
src/gns/gnunet-gns-proxy.c | 90 +-
src/gns/gnunet-gns.c | 162 +-
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 | 23 +-
src/gns/plugin_rest_gns.c | 54 +-
src/gns/test_gns_nick_shorten.sh | 124 -
src/gns/test_gns_reverse_lookup.sh | 50 -
src/gns/w32nsp-resolve.c | 3 +
.../gnunet-service-identity-provider.c | 7 +-
src/identity/gnunet-identity.c | 64 +-
src/include/Makefile.am | 1 +
src/include/gnunet_block_group_lib.h | 18 +
src/include/gnunet_block_lib.h | 19 +-
src/include/gnunet_block_plugin.h | 2 +
src/include/gnunet_cadet_service.h | 4 +-
src/include/gnunet_common.h | 2 +-
src/include/gnunet_gns_service.h | 37 +-
src/include/gnunet_mq_lib.h | 27 +-
src/include/gnunet_mysql_lib.h | 14 +-
src/include/gnunet_plugin_lib.h | 2 +-
src/include/gnunet_pq_lib.h | 20 +-
src/include/gnunet_protocols.h | 19 +
src/include/gnunet_set_service.h | 59 +-
src/include/{gnunet_pq_lib.h => gnunet_sq_lib.h} | 213 +-
src/include/gnunet_strings_lib.h | 14 +-
src/integration-tests/.gitignore | 8 +
src/multicast/Makefile.am | 4 +-
src/multicast/gnunet-service-multicast.c | 950 +--
src/multicast/test_multicast.c | 9 +
src/multicast/test_multicast.conf | 10 +-
src/multicast/test_multicast_multipeer.c | 58 +-
src/namecache/.gitignore | 1 +
src/namestore/.gitignore | 1 +
src/nat/gnunet-helper-nat-client-windows.c | 2 +
src/nat/gnunet-helper-nat-server-windows.c | 2 +
src/nat/gnunet-nat.c | 3 +
src/peerinfo/.gitignore | 1 +
src/peerinfo/perf_peerinfo_api.c | 93 +-
src/peerstore/.gitignore | 1 +
src/peerstore/gnunet-service-peerstore.c | 4 +-
src/pq/pq_result_helper.c | 50 +-
src/pq/test_pq.c | 6 +-
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/plugin_block_regex.c | 33 +-
src/revocation/Makefile.am | 17 +-
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/rps/gnunet-service-rps.c | 4 +-
.../gnunet-service-scalarproduct-ecc_alice.c | 3 +
.../gnunet-service-scalarproduct-ecc_bob.c | 3 +
.../gnunet-service-scalarproduct_alice.c | 3 +
.../gnunet-service-scalarproduct_bob.c | 7 +-
src/secretsharing/.gitignore | 1 +
src/secretsharing/Makefile.am | 3 +-
src/set/Makefile.am | 16 +
src/set/gnunet-service-set.c | 128 +-
src/set/gnunet-service-set.h | 24 +
src/set/gnunet-service-set_protocol.h | 14 +
src/set/gnunet-service-set_union.c | 482 +-
src/set/gnunet-set-profiler.c | 105 +-
.../plugin_block_set_test.c} | 88 +-
src/set/set.h | 53 +
src/set/set_api.c | 27 +
src/set/test_set.conf | 1 -
src/set/test_set_api.c | 5 +
src/set/test_set_intersection_result_full.c | 4 +
src/set/test_set_union_result_symmetric.c | 4 +
src/social/gnunet-service-social.c | 8 +-
src/sq/.gitignore | 1 +
src/sq/Makefile.am | 40 +
src/sq/sq.c | 108 +
src/sq/sq_query_helper.c | 443 ++
src/sq/sq_result_helper.c | 710 +++
src/sq/test_sq.c | 279 +
src/testing/testing.c | 4 +-
.../gnunet-service-transport_neighbours.c | 38 +-
src/transport/test_transport_address_switch.c | 11 +-
src/transport/test_transport_api_reliability.c | 12 +-
src/transport/transport.conf.in | 2 +
src/util/Makefile.am | 5 +-
src/util/bio.c | 2 +-
src/util/client.c | 7 +-
src/util/common_allocation.c | 4 +-
src/util/common_endian.c | 2 +-
src/util/configuration_loader.c | 2 +-
src/util/connection.c | 15 +-
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 | 6 +-
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 | 8 +-
src/util/getopt.c | 4 +-
src/util/getopt_helpers.c | 2 +-
src/util/load.c | 2 +-
src/util/mq.c | 83 +-
src/util/mst.c | 2 +-
src/util/network.c | 6 +-
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 | 4 +-
src/util/resolver_api.c | 8 +-
src/util/server.c | 16 +-
src/util/server_mst.c | 2 +-
src/util/server_tc.c | 2 +-
src/util/service.c | 6 +-
src/util/service_new.c | 28 +-
src/util/signal.c | 2 +-
src/util/socks.c | 4 +-
src/util/speedup.c | 2 +-
src/util/strings.c | 38 +-
src/util/time.c | 2 +-
src/util/win.c | 10 +-
src/util/winproc.c | 2 +-
src/vpn/Makefile.am | 4 +-
src/vpn/gnunet-service-vpn.c | 3143 +++++-----
224 files changed, 9478 insertions(+), 18512 deletions(-)
diff --cc src/multicast/test_multicast.conf
index 675776bbc,675776bbc..3081aeecc
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@@ -1,4 -1,4 +1,12 @@@
++[testbed]
++HOSTNAME = localhost
++
[arm]
GLOBAL_POSTFIX=-L ERROR
--#PREFIX = sakura -t test-multicast -e cgdb --args
++[multicast]
++#PREFIX = xterm -T peer -e gdb --args
++UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
++
++[vpn]
++AUTOSTART = NO
diff --cc src/multicast/test_multicast_multipeer.c
index aee3a44d5,1b76737f4..0f973517d
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@@ -120,30 -121,13 +120,30 @@@ member_join_request (void *cls
const struct GNUNET_MessageHeader *join_msg,
struct GNUNET_MULTICAST_JoinHandle *jh)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Member sent a join request.\n");
-
+
}
+int notify (void *cls,
+ size_t *data_size,
+ void *data)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Member sents message to origin.\n");
+
+ char text[] = "ping";
+ *data_size = strlen(text);
+ GNUNET_memcpy(data, text, *data_size);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "len: %i.\n", strlen(text));
+
+ return GNUNET_YES;
+}
+
- static void
+ static void
member_join_decision (void *cls,
int is_admitted,
const struct GNUNET_PeerIdentity *peer,
@@@ -151,24 -135,17 +151,24 @@@
const struct GNUNET_PeerIdentity *relays,
const struct GNUNET_MessageHeader *join_msg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ struct GNUNET_MULTICAST_MemberTransmitHandle *req;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Member received a decision from origin: %s\n", (GNUNET_YES ==
is_admitted)?"accepted":"rejected");
-
- result = GNUNET_OK;
- GNUNET_SCHEDULER_shutdown ();
+
+ if (GNUNET_YES == is_admitted)
+ {
+ req = GNUNET_MULTICAST_member_to_origin (member,
+ 0,
+ notify,
+ NULL);
+ }
}
- static void
+ static void
member_replay_frag ()
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"member replay frag...\n");
}
@@@ -217,25 -196,25 +217,25 @@@ origin_join_request (void *cls
result = GNUNET_OK;
}
- static void
+ static void
origin_replay_frag (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
- uint64_t fragment_id,
- uint64_t flags,
- struct GNUNET_MULTICAST_ReplayHandle *rh)
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
+ uint64_t fragment_id,
+ uint64_t flags,
+ struct GNUNET_MULTICAST_ReplayHandle *rh)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay fraq msg\n");
}
- static void
+ static void
origin_replay_msg (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
- uint64_t message_id,
- uint64_t fragment_offset,
- uint64_t flags,
- struct GNUNET_MULTICAST_ReplayHandle *rh)
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
+ uint64_t message_id,
+ uint64_t fragment_offset,
+ uint64_t flags,
+ struct GNUNET_MULTICAST_ReplayHandle *rh)
{
-
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay msg\n");
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (95646a7b4 -> 4bf28bcaa), gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 01/07: More API function tests..., gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 05/07: Merge branch 'master' of ssh://gnunet.org/gnunet, gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 02/07: More API function tests..., gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 06/07: Merge branch 'master' of ssh://gnunet.org/gnunet, gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 04/07: Merge branch 'master' of ssh://gnunet.org/gnunet, gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 07/07: test_multicast_multipeer.c: add ping pong test, gnunet, 2017/03/08
- [GNUnet-SVN] [gnunet] 03/07: Merge branch 'master' of ssh://gnunet.org/gnunet,
gnunet <=