[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: cancel existing last_contro
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: cancel existing last_control_qe handle before scheduling a new one, always |
Date: |
Thu, 16 Feb 2017 14:53:15 +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 ad22adb15 cancel existing last_control_qe handle before scheduling a
new one, always
ad22adb15 is described below
commit ad22adb15a0c895ac9c25d4c289abf86355a4737
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Feb 16 14:54:14 2017 +0100
cancel existing last_control_qe handle before scheduling a new one, always
---
src/cadet/gnunet-service-cadet-new_channel.c | 6 ++++--
src/util/mq.c | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c
b/src/cadet/gnunet-service-cadet-new_channel.c
index 6df6c24cd..fe3faef5a 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -566,6 +566,8 @@ send_channel_open (void *cls)
msgcc.port = ch->port;
msgcc.ctn = ch->ctn;
ch->state = CADET_CHANNEL_OPEN_SENT;
+ if (NULL != ch->last_control_qe)
+ GCT_send_cancel (ch->last_control_qe);
ch->last_control_qe = GCT_send (ch->t,
&msgcc.header,
&channel_open_sent_cb,
@@ -801,13 +803,13 @@ send_channel_data_ack (struct CadetChannel *ch)
msg.ctn = ch->ctn;
msg.mid.mid = htonl (ntohl (ch->mid_recv.mid));
msg.futures = GNUNET_htonll (ch->mid_futures);
- if (NULL != ch->last_control_qe)
- GCT_send_cancel (ch->last_control_qe);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending DATA_ACK %u:%llX via %s\n",
(unsigned int) ntohl (msg.mid.mid),
(unsigned long long) ch->mid_futures,
GCCH_2s (ch));
+ if (NULL != ch->last_control_qe)
+ GCT_send_cancel (ch->last_control_qe);
ch->last_control_qe = GCT_send (ch->t,
&msg.header,
&send_ack_cb,
diff --git a/src/util/mq.c b/src/util/mq.c
index bd7ad7c47..265e4744b 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -730,7 +730,8 @@ server_client_send_impl (struct GNUNET_MQ_Handle *mq,
state->th = GNUNET_SERVER_notify_transmit_ready (state->client,
ntohs (msg->size),
GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_queued, mq);
+ &transmit_queued,
+ mq);
}
--
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: cancel existing last_control_qe handle before scheduling a new one, always,
gnunet <=