[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 37/64: mark channel as disconnectin when a part re
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 37/64: mark channel as disconnectin when a part request is sent; cleanup |
Date: |
Sat, 30 Dec 2017 20:58:22 +0100 |
This is an automated email from the git hooks/post-receive script.
lurchi pushed a commit to branch master
in repository gnunet.
commit 130d7e66aea9c9b6ec3955dc9446530057dcb10c
Author: lurchi <address@hidden>
AuthorDate: Fri Nov 24 21:58:12 2017 +0100
mark channel as disconnectin when a part request is sent; cleanup
---
src/psyc/psyc_api.c | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c
index cdb9ce881..a045f9eb2 100644
--- a/src/psyc/psyc_api.c
+++ b/src/psyc/psyc_api.c
@@ -598,34 +598,6 @@ handle_channel_part_ack (void *cls,
}
-//static void
-//channel_disconnect (struct GNUNET_PSYC_Channel *chn,
-// GNUNET_ContinuationCallback cb,
-// void *cls)
-//{
-// chn->is_disconnecting = GNUNET_YES;
-// chn->disconnect_cb = cb;
-// chn->disconnect_cls = cls;
-//
-// if (NULL != chn->mq)
-// {
-// struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (chn->mq);
-// if (NULL != env)
-// {
-// GNUNET_MQ_notify_sent (env, (GNUNET_SCHEDULER_TaskCallback)
channel_cleanup, chn);
-// }
-// else
-// {
-// channel_cleanup (chn);
-// }
-// }
-// else
-// {
-// channel_cleanup (chn);
-// }
-//}
-
-
/*** MASTER ***/
@@ -800,6 +772,7 @@ GNUNET_PSYC_master_stop (struct GNUNET_PSYC_Master *mst,
struct GNUNET_PSYC_Channel *chn = &mst->chn;
struct GNUNET_MQ_Envelope *env;
+ chn->is_disconnecting = GNUNET_YES;
chn->disconnect_cb = stop_cb;
chn->disconnect_cls = stop_cls;
env = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_PSYC_PART_REQUEST);
@@ -1144,6 +1117,7 @@ GNUNET_PSYC_slave_part (struct GNUNET_PSYC_Slave *slv,
struct GNUNET_PSYC_Channel *chn = &slv->chn;
struct GNUNET_MQ_Envelope *env;
+ chn->is_disconnecting = GNUNET_YES;
chn->disconnect_cb = part_cb;
chn->disconnect_cls = part_cls;
env = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_PSYC_PART_REQUEST);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 35/64: added FIXMEs, (continued)
- [GNUnet-SVN] [gnunet] 35/64: added FIXMEs, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 32/64: commented out wrong message type, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 40/64: revert commit 6490b5f31e58e9ec008f8c5ceda28f6054f1bbba, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 23/64: improve documentation, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 19/64: allow MST callback to distinguish between disconnect and parse error situations, and only log for the hard errors, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 36/64: added FIXME, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 31/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 26/64: finalize protocol change (fixes message loss when leaving a place), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 47/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 39/64: WARNING -> DEBUG, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 37/64: mark channel as disconnectin when a part request is sent; cleanup,
gnunet <=
- [GNUnet-SVN] [gnunet] 33/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 24/64: changed log levels, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 42/64: added logging, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 54/64: test_social: less services and less noise in the output, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 34/64: introduce part request / part ack messages (for leaving multicast groups) and related fixes, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 43/64: fixed compile error, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 29/64: use comfort functions of MQ API, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 30/64: Introduce PART/PART_ACK messages (tests will fail until multicast module is adapted, too), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 22/64: protocol change: add ack message for guests/hosts leaving a place, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 44/64: tried to print out stacktrace, not working. removed., gnunet, 2017/12/30