[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 05/19: only send CHANNEL_DESTROY message if we at
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 05/19: only send CHANNEL_DESTROY message if we at least send the CHANNEL_CREATE message, and not if the tunnel never went up in the first place |
Date: |
Sun, 22 Jan 2017 15:23:46 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit e8e9d033819c20be0ce6a6e2473e279e23cc80b4
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jan 22 11:44:22 2017 +0100
only send CHANNEL_DESTROY message if we at least send the CHANNEL_CREATE
message, and not if the tunnel never went up in the first place
---
src/cadet/gnunet-service-cadet-new_channel.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c
b/src/cadet/gnunet-service-cadet-new_channel.c
index 60e1a7766..4bff1a1c5 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -770,9 +770,11 @@ GCCH_channel_local_destroy (struct CadetChannel *ch)
ch->destroy = GNUNET_YES;
return;
}
- /* Nothing left to do, just finish destruction */
- GCT_send_channel_destroy (ch->t,
- ch->ctn);
+ /* If the we ever sent the CHANNEL_CREATE, we need to send a destroy
message. */
+ if (CADET_CHANNEL_NEW != ch->state)
+ GCT_send_channel_destroy (ch->t,
+ ch->ctn);
+ /* Now finish our clean up */
channel_destroy (ch);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (a225f5848 -> 4c56d5a0f), gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 05/19: only send CHANNEL_DESTROY message if we at least send the CHANNEL_CREATE message, and not if the tunnel never went up in the first place,
gnunet <=
- [GNUnet-SVN] [gnunet] 08/19: allow NULL argument for GNUNET_i2s(), gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 03/19: improve logging, log before doing, not after, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 01/19: optimize startup sequence for when we execute first DHT PUTs, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 11/19: fix buffer size, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 04/19: fix startup interaction between channel and tunnel to not send CHANNEL_OPEN until tunnel is in KEY_OK state, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 18/19: nicer logging, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 10/19: make GCPP_2s also return static string, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 12/19: fix a few off-by-ones, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 02/19: do not run upnpc during tests, produces unnecessary errors if not available, gnunet, 2017/01/22
- [GNUnet-SVN] [gnunet] 16/19: nicer order of LOG statements, gnunet, 2017/01/22