diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-11-14 17:17:42 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-11-14 17:17:42 +0100 |
commit | c90b5703c88339f7bdf909b77a45ea93c21792cd (patch) | |
tree | fc3397900dc6bdbcdd17cf773f6d60e53abc025a /src/cadet/gnunet-service-cadet_tunnels.c | |
parent | f62e24a88c21235bc3c901508cfb474509ef2961 (diff) | |
parent | d36019fe48ff1e4e56754ef3e689bd67445a38f6 (diff) | |
download | gnunet-c90b5703c88339f7bdf909b77a45ea93c21792cd.tar.gz gnunet-c90b5703c88339f7bdf909b77a45ea93c21792cd.zip |
Merge branch 'master' of git+ssh://gnunet.org/gnunet
Diffstat (limited to 'src/cadet/gnunet-service-cadet_tunnels.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 78bc54a5c..c1c511da1 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -2433,7 +2433,8 @@ connection_ready_cb (void *cls, | |||
2433 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2433 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2434 | "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n", | 2434 | "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n", |
2435 | GCT_2s (t), | 2435 | GCT_2s (t), |
2436 | GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us); | 2436 | (unsigned long long) GNUNET_TIME_absolute_get_remaining ( |
2437 | t->next_kx_attempt).rel_value_us); | ||
2437 | /* Do not begin KX if WE have no channels waiting! */ | 2438 | /* Do not begin KX if WE have no channels waiting! */ |
2438 | if (0 != GNUNET_TIME_absolute_get_remaining ( | 2439 | if (0 != GNUNET_TIME_absolute_get_remaining ( |
2439 | t->next_kx_attempt).rel_value_us) | 2440 | t->next_kx_attempt).rel_value_us) |
@@ -3279,7 +3280,7 @@ GCT_handle_encrypted (struct CadetTConnection *ct, | |||
3279 | { | 3280 | { |
3280 | struct CadetTunnel *t = ct->t; | 3281 | struct CadetTunnel *t = ct->t; |
3281 | uint16_t size = ntohs (msg->header.size); | 3282 | uint16_t size = ntohs (msg->header.size); |
3282 | char cbuf [size] GNUNET_ALIGN; | 3283 | char cbuf[size] GNUNET_ALIGN; |
3283 | ssize_t decrypted_size; | 3284 | ssize_t decrypted_size; |
3284 | 3285 | ||
3285 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3286 | LOG (GNUNET_ERROR_TYPE_DEBUG, |