gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] 11/15: Merge branch 'master' of ssh://gnunet.org/g


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 11/15: Merge branch 'master' of ssh://gnunet.org/gnunet
Date: Wed, 19 Apr 2017 09:39:18 +0200

This is an automated email from the git hooks/post-receive script.

xrs pushed a commit to branch master
in repository gnunet.

commit 03512957fb04969d08fb7eac0952a747aa9596ae
Merge: 633c9ed2d 7307d73db
Author: xrs <address@hidden>
AuthorDate: Fri Mar 24 15:31:29 2017 +0100

    Merge branch 'master' of ssh://gnunet.org/gnunet

 AUTHORS                                            |    1 +
 README                                             |    2 +-
 configure.ac                                       |    2 +-
 contrib/.gitignore                                 |    1 +
 po/POTFILES.in                                     |   26 +-
 src/arm/arm_api.c                                  |    2 +-
 src/arm/gnunet-arm.c                               |   97 +-
 src/arm/gnunet-service-arm.c                       |    2 +-
 src/ats-tests/gnunet-solver-eval.c                 |   29 +-
 src/ats-tool/gnunet-ats.c                          |   84 +-
 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/cadet/Makefile.am                              |    2 +-
 src/cadet/gnunet-cadet.c                           |   72 +-
 src/cadet/test_cadet.c                             |   26 +-
 src/consensus/consensus_protocol.h                 |    6 +-
 src/consensus/gnunet-consensus-profiler.c          |   74 +-
 src/conversation/gnunet-conversation.c             |   21 +-
 src/conversation/gnunet-helper-audio-playback.c    |   15 +-
 src/conversation/microphone.c                      |    2 -
 src/core/core_api.c                                |    4 +-
 src/core/gnunet-core.c                             |    9 +-
 src/core/gnunet-service-core.c                     |    2 +-
 src/core/gnunet-service-core_kx.c                  |  152 +-
 src/datastore/datastore.h                          |   24 +-
 src/datastore/datastore_api.c                      |   53 +-
 src/datastore/gnunet-datastore.c                   |   50 +-
 src/datastore/gnunet-service-datastore.c           |   60 +-
 src/datastore/plugin_datastore_heap.c              |  296 +--
 src/datastore/plugin_datastore_mysql.c             |  306 +--
 src/datastore/plugin_datastore_postgres.c          |  345 +--
 src/datastore/plugin_datastore_sqlite.c            |  323 +--
 src/datastore/plugin_datastore_template.c          |   43 +-
 src/datastore/test_datastore_api.c                 |   47 +-
 src/datastore/test_datastore_api_management.c      |   44 +-
 src/datastore/test_plugin_datastore.c              |   14 +-
 src/dht/dht_api.c                                  |   14 +-
 src/dht/gnunet-dht-get.c                           |   68 +-
 src/dht/gnunet-dht-monitor.c                       |   50 +-
 src/dht/gnunet-dht-put.c                           |   84 +-
 src/dht/gnunet-service-dht_clients.c               |    2 +-
 src/dht/gnunet-service-dht_datacache.c             |    2 +-
 src/dht/gnunet-service-dht_neighbours.c            |   16 +-
 src/dht/gnunet_dht_profiler.c                      |   73 +-
 src/dns/dns_api.c                                  |    2 +-
 src/dns/gnunet-dns-monitor.c                       |   21 +-
 src/dns/gnunet-dns-redirector.c                    |   22 +-
 src/dns/gnunet-helper-dns.c                        |    2 +-
 src/dns/gnunet-service-dns.c                       |    7 +-
 src/dv/dv_api.c                                    |    2 +-
 src/dv/gnunet-dv.c                                 |   10 +-
 src/dv/gnunet-service-dv.c                         |    4 +-
 src/exit/gnunet-daemon-exit.c                      |   10 +-
 src/exit/gnunet-helper-exit-windows.c              |    2 +-
 src/exit/gnunet-helper-exit.c                      |    2 +-
 src/fs/fs_api.h                                    |   10 -
 src/fs/fs_dirmetascan.c                            |    2 -
 src/fs/fs_getopt.c                                 |   79 +-
 src/fs/fs_publish.c                                |    4 +-
 src/fs/fs_search.c                                 |    2 +-
 src/fs/fs_unindex.c                                |   58 +-
 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                                 |   13 +-
 src/fs/gnunet-publish.c                            |  151 +-
 src/fs/gnunet-search.c                             |   58 +-
 src/fs/gnunet-service-fs_cadet_server.c            |   50 +-
 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_pr.c                      |  420 ++--
 src/fs/gnunet-service-fs_push.c                    |    6 +-
 src/fs/gnunet-service-fs_put.c                     |   46 +-
 src/fs/gnunet-unindex.c                            |   10 +-
 src/gns/gns_api.c                                  |    2 +-
 src/gns/gnunet-bcd.c                               |   12 +-
 src/gns/gnunet-dns2gns.c                           |   48 +-
 src/gns/gnunet-gns-proxy.c                         |   25 +-
 src/gns/gnunet-gns.c                               |   56 +-
 src/hello/hello.c                                  |    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 +-
 src/identity-provider/identity_provider_api.c      |    4 +-
 src/identity/gnunet-identity.c                     |   54 +-
 src/identity/identity_api.c                        |   14 +-
 src/include/Makefile.am                            |    2 -
 src/include/gnunet_bandwidth_lib.h                 |   14 +-
 src/include/gnunet_connection_lib.h                |  400 ---
 src/include/gnunet_constants.h                     |    2 +
 src/include/gnunet_datastore_plugin.h              |   85 +-
 src/include/gnunet_datastore_service.h             |   22 +-
 src/include/gnunet_fs_service.h                    |   47 +-
 src/include/gnunet_getopt_lib.h                    |  349 +--
 src/include/gnunet_helper_lib.h                    |    8 +-
 src/include/gnunet_json_lib.h                      |   20 +
 src/include/gnunet_mq_lib.h                        |    1 +
 src/include/gnunet_server_lib.h                    |  887 -------
 src/include/gnunet_service_lib.h                   |  107 +-
 src/include/gnunet_util_lib.h                      |   17 +-
 src/include/platform.h                             |    1 +
 src/json/json.c                                    |   73 +-
 src/multicast/.gitignore                           |    1 +
 src/multicast/gnunet-service-multicast.c           |    3 +
 src/namecache/gnunet-namecache.c                   |   20 +-
 src/namestore/gnunet-namestore.c                   |  125 +-
 src/namestore/gnunet-service-namestore.c           |    2 +-
 src/nat-auto/Makefile.am                           |    5 +-
 src/nat-auto/gnunet-nat-auto.c                     |   44 +-
 src/nat-auto/gnunet-nat-server.c                   |  212 +-
 src/nat-auto/nat_auto_api.c                        |    2 +-
 src/nat/gnunet-nat.c                               |   65 +-
 src/nat/nat_api.c                                  |    2 +-
 src/nse/gnunet-nse-profiler.c                      |   65 +-
 src/peerinfo-tool/gnunet-peerinfo.c                |   67 +-
 src/peerinfo/gnunet-service-peerinfo.c             |    8 +-
 src/pq/pq.c                                        |    7 +-
 src/psyc/.gitignore                                |    1 +
 src/psyc/psyc_api.c                                |    4 +-
 src/psycstore/.gitignore                           |    4 +
 src/psycstore/gnunet-service-psycstore.c           |    2 +-
 src/psycstore/psycstore_api.c                      |    4 +-
 src/psycutil/.gitignore                            |    1 +
 src/regex/gnunet-regex-profiler.c                  |   49 +-
 src/regex/gnunet-regex-simulation-profiler.c       |   21 +-
 src/regex/gnunet-service-regex.c                   |  323 +--
 src/regex/regex_api_announce.c                     |    2 +-
 src/regex/regex_api_search.c                       |    2 +-
 src/rest/gnunet-rest-server.c                      |   14 +-
 src/revocation/gnunet-revocation.c                 |   38 +-
 src/rps/gnunet-rps.c                               |   57 +-
 src/rps/gnunet-service-rps.c                       |    4 +-
 src/rps/rps_api.c                                  |    8 +-
 src/rps/test_rps.c                                 |    6 +-
 src/scalarproduct/gnunet-scalarproduct.c           |   36 +-
 src/scalarproduct/scalarproduct_api.c              |    8 +-
 src/secretsharing/gnunet-secretsharing-profiler.c  |   59 +-
 src/secretsharing/gnunet-service-secretsharing.c   |   27 +-
 src/set/gnunet-set-ibf-profiler.c                  |   49 +-
 src/set/gnunet-set-profiler.c                      |   86 +-
 src/social/.gitignore                              |    1 +
 src/social/gnunet-social.c                         |  277 ++-
 src/social/social_api.c                            |   10 +-
 src/statistics/gnunet-service-statistics.c         |    2 +-
 src/statistics/gnunet-statistics.c                 |   60 +-
 src/statistics/statistics_api.c                    |    6 +-
 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/generate-underlay-topology.c           |   12 +-
 src/testbed/gnunet-helper-testbed.c                |    2 +-
 src/testbed/gnunet-service-testbed_barriers.c      |    4 +-
 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/testing/gnunet-testing.c                       |   40 +-
 src/testing/list-keys.c                            |   15 +-
 src/topology/gnunet-daemon-topology.c              |    2 +-
 src/transport/Makefile.am                          |    4 +-
 src/transport/gnunet-helper-transport-wlan-dummy.c |   30 +-
 .../gnunet-service-transport_validation.c          |    2 +-
 src/transport/gnunet-transport-profiler.c          |   54 +-
 src/transport/gnunet-transport.c                   |  120 +-
 src/transport/plugin_transport_http_client.c       |   25 +-
 src/transport/plugin_transport_http_server.c       |   25 +-
 src/transport/plugin_transport_tcp.c               |  587 ++++-
 src/transport/plugin_transport_udp.c               |   41 +-
 src/transport/plugin_transport_udp.h               |   12 +-
 src/transport/plugin_transport_udp_broadcasting.c  |   30 +-
 src/transport/plugin_transport_wlan.c              |   31 +-
 .../tcp_connection_legacy.c}                       |   24 +-
 .../server.c => transport/tcp_server_legacy.c}     |   12 +-
 .../tcp_server_mst_legacy.c}                       |    6 +-
 .../service.c => transport/tcp_service_legacy.c}   |   89 +-
 src/transport/test_plugin_transport.c              |    2 +-
 src/transport/test_transport_api_reliability.c     |    2 +-
 src/transport/transport_api_address_to_string.c    |    6 +-
 src/transport/transport_api_core.c                 |    2 +-
 src/util/Makefile.am                               |   96 +-
 src/util/bandwidth.c                               |   20 +-
 src/util/client.c                                  |   13 +-
 src/util/getopt.c                                  |   72 +-
 src/util/getopt_helpers.c                          |  634 ++++-
 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/mq.c                                      |  104 -
 src/util/mst.c                                     |    4 +-
 src/util/resolver_api.c                            |    2 +-
 src/util/server_nc.c                               |  472 ----
 src/util/server_tc.c                               |  242 --
 src/util/service.c                                 | 2441 ++++++++++++------
 src/util/service_new.c                             | 2615 --------------------
 src/util/test_client.c                             |    2 +-
 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_getopt.c                             |   43 +-
 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/vpn/gnunet-helper-vpn-windows.c                |    2 +-
 src/vpn/gnunet-helper-vpn.c                        |    2 +-
 src/vpn/gnunet-service-vpn.c                       |   16 +-
 src/vpn/gnunet-vpn.c                               |   72 +-
 222 files changed, 7215 insertions(+), 11141 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]