diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-11-01 15:29:10 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-11-01 15:29:51 +0100 |
commit | 11916b980c6f022ef4be5e34eea2a0abdce68b10 (patch) | |
tree | f4245de001e8d697f8c1dfbcddab3e2447e90507 /src/cadet | |
parent | eead33d85b73836ae23a2082326cf2ad8bfa2f7f (diff) | |
download | gnunet-11916b980c6f022ef4be5e34eea2a0abdce68b10.tar.gz gnunet-11916b980c6f022ef4be5e34eea2a0abdce68b10.zip |
attempting to fix #5464
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/.gitignore | 3 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cadet/.gitignore b/src/cadet/.gitignore index 44382fde9..935049ce8 100644 --- a/src/cadet/.gitignore +++ b/src/cadet/.gitignore | |||
@@ -21,4 +21,5 @@ test_cadet_local | |||
21 | test_cadet_single | 21 | test_cadet_single |
22 | gnunet-service-cadet-new | 22 | gnunet-service-cadet-new |
23 | test_cadet_local_mq | 23 | test_cadet_local_mq |
24 | test_cadet_*_new \ No newline at end of file | 24 | test_cadet_*_newtest_cadet_2_reopen |
25 | test_cadet_5_reopen | ||
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index 06711dc8b..8ef598132 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -500,6 +500,11 @@ channel_destroy (struct CadetChannel *ch) | |||
500 | GNUNET_free (crm->data_message); | 500 | GNUNET_free (crm->data_message); |
501 | GNUNET_free (crm); | 501 | GNUNET_free (crm); |
502 | } | 502 | } |
503 | if (CADET_CHANNEL_LOOSE == ch->state) | ||
504 | { | ||
505 | GSC_drop_loose_channel (&ch->h_port, | ||
506 | ch); | ||
507 | } | ||
503 | if (NULL != ch->owner) | 508 | if (NULL != ch->owner) |
504 | { | 509 | { |
505 | free_channel_client (ch->owner); | 510 | free_channel_client (ch->owner); |
@@ -1136,8 +1141,6 @@ GCCH_channel_local_destroy (struct CadetChannel *ch, | |||
1136 | target, but that never went anywhere. Nothing to do here. */ | 1141 | target, but that never went anywhere. Nothing to do here. */ |
1137 | break; | 1142 | break; |
1138 | case CADET_CHANNEL_LOOSE: | 1143 | case CADET_CHANNEL_LOOSE: |
1139 | GSC_drop_loose_channel (&ch->h_port, | ||
1140 | ch); | ||
1141 | break; | 1144 | break; |
1142 | default: | 1145 | default: |
1143 | GCT_send_channel_destroy (ch->t, | 1146 | GCT_send_channel_destroy (ch->t, |