[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 64/64: Merge branch 'fix_social'
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 64/64: Merge branch 'fix_social' |
Date: |
Sat, 30 Dec 2017 20:58:49 +0100 |
This is an automated email from the git hooks/post-receive script.
lurchi pushed a commit to branch master
in repository gnunet.
commit 5c8feda7faa01365a1fb6983595ceb65dfe4fb11
Merge: d01f1bd83 8412625bb
Author: lurchi <address@hidden>
AuthorDate: Sat Dec 30 20:46:59 2017 +0100
Merge branch 'fix_social'
src/cadet/gnunet-service-cadet_tunnels.c | 4 +-
.../gnunet-helper-audio-playback-gst.c | 5 +
src/conversation/gnunet-helper-audio-playback.c | 5 +
src/conversation/gnunet_gst.c | 5 +
src/conversation/microphone.c | 4 +-
src/core/gnunet-service-core.c | 3 +
src/core/gnunet-service-core_kx.c | 3 +
src/fs/fs_dirmetascan.c | 3 +
src/include/gnunet_mst_lib.h | 4 +-
src/include/gnunet_protocols.h | 30 +-
src/include/gnunet_service_lib.h | 7 +-
src/multicast/gnunet-service-multicast.c | 248 ++++---
src/multicast/multicast_api.c | 51 +-
src/multicast/test_multicast_multipeer.c | 312 +++++----
src/psyc/gnunet-service-psyc.c | 131 ++--
src/psyc/psyc_api.c | 103 ++-
src/psyc/test_psyc.c | 28 +-
src/psyc/test_psyc.conf | 16 +
src/psycstore/psycstore_api.c | 10 +-
src/social/gnunet-service-social.c | 774 +++++++++++----------
src/social/gnunet-social.c | 26 +-
src/social/social_api.c | 292 +++++---
src/social/test_social.c | 268 ++++---
src/social/test_social.conf | 19 +
src/statistics/gnunet-service-statistics.c | 4 +-
src/testbed/gnunet-helper-testbed.c | 7 +-
src/transport/gnunet-helper-transport-wlan-dummy.c | 6 +
src/transport/plugin_transport_http_server.c | 2 +-
src/util/client.c | 41 +-
src/util/mq.c | 22 +
src/util/mst.c | 27 +-
src/util/scheduler.c | 4 +-
src/util/service.c | 31 +-
src/vpn/gnunet-service-vpn.c | 3 +
34 files changed, 1500 insertions(+), 998 deletions(-)
diff --cc src/social/gnunet-social.c
index de680b11c,0de8809ff..12c5bf2e1
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@@ -281,9 -281,9 +281,9 @@@ exit_fail (
* This also indicates the end of the connection to the service.
*/
static void
-host_left ()
+host_left (void *cls)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"The host has left the place.\n");
exit_success ();
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 61/64: consider entry decision while re-entering a place, (continued)
- [GNUnet-SVN] [gnunet] 61/64: consider entry decision while re-entering a place, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 27/64: Use MQ API instead of manually allocating messages; simplify logic in handle_client_psyc_message; cleanup, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 45/64: actually use the is_disconnecting flag; debug output; remove dead code, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 46/64: don't shutdown before all members and origin have disconnected, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 38/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 48/64: we have to destroy channels to the origin when cleaning up a member, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 41/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 51/64: be more clear about test procedure (use self-explanatory function names), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 57/64: test_social runs into the case GNUNET_YES == grp->is_disconnected, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 49/64: forgot to call GNUNET_SERVICE_client_continue, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 64/64: Merge branch 'fix_social',
gnunet <=
- [GNUnet-SVN] [gnunet] 28/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 53/64: unified debug output (allows grep OP ID), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 62/64: cleanup, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 63/64: Revert "tried to print out stacktrace, not working. removed.", gnunet, 2017/12/30