[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: make sure after any transmi
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: make sure after any transmission succeeds we continue looking for more (previous code missed some corner cases, see #4896/11780) |
Date: |
Sat, 18 Feb 2017 20:05:01 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 6f8fabef0 make sure after any transmission succeeds we continue
looking for more (previous code missed some corner cases, see #4896/11780)
6f8fabef0 is described below
commit 6f8fabef01d53234928a2c766fe19b0bbb00a2a2
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Feb 18 20:02:21 2017 +0100
make sure after any transmission succeeds we continue looking for more
(previous code missed some corner cases, see #4896/11780)
---
src/cadet/gnunet-service-cadet-new_core.c | 1 -
src/cadet/gnunet-service-cadet-new_peer.c | 10 ++++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/cadet/gnunet-service-cadet-new_core.c
b/src/cadet/gnunet-service-cadet-new_core.c
index 05fe5f49f..3768c36a5 100644
--- a/src/cadet/gnunet-service-cadet-new_core.c
+++ b/src/cadet/gnunet-service-cadet-new_core.c
@@ -596,7 +596,6 @@ send_broken (struct RouteDirection *target,
bm->peer1 = *peer1;
if (NULL != peer2)
bm->peer2 = *peer2;
-
GCP_request_mq_cancel (target->mqm,
env);
target->mqm = NULL;
diff --git a/src/cadet/gnunet-service-cadet-new_peer.c
b/src/cadet/gnunet-service-cadet-new_peer.c
index 136ab8297..7b944afd8 100644
--- a/src/cadet/gnunet-service-cadet-new_peer.c
+++ b/src/cadet/gnunet-service-cadet-new_peer.c
@@ -1398,10 +1398,17 @@ GCP_request_mq_cancel (struct GCP_MessageQueueManager
*mqm,
if (NULL != last_env)
{
if (NULL != cp->core_mq)
+ {
+ GNUNET_MQ_notify_sent (last_env,
+ &mqm_send_done,
+ cp);
GNUNET_MQ_send (cp->core_mq,
last_env);
+ }
else
+ {
GNUNET_MQ_discard (last_env);
+ }
}
if (cp->mqm_ready_ptr == mqm)
cp->mqm_ready_ptr = mqm->next;
@@ -1433,6 +1440,9 @@ GCP_send_ooo (struct CadetPeer *cp,
GNUNET_MQ_discard (env);
return;
}
+ GNUNET_MQ_notify_sent (env,
+ &mqm_send_done,
+ cp);
GNUNET_MQ_send (cp->core_mq,
env);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: make sure after any transmission succeeds we continue looking for more (previous code missed some corner cases, see #4896/11780),
gnunet <=