diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-09 07:17:19 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-09 07:17:19 +0100 |
commit | 2ed3dc28ad297c3ced59142c1baf8258eedd3d11 (patch) | |
tree | 7b4d3c79c21ec03886af0373a941d3add5d991ee | |
parent | daf0c12b555bc2baf59b97a7279a8f3f5db16511 (diff) | |
download | gnunet-2ed3dc28ad297c3ced59142c1baf8258eedd3d11.tar.gz gnunet-2ed3dc28ad297c3ced59142c1baf8258eedd3d11.zip |
fix more field initialziation order issues
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 3 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnel.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index 22349aa80..6f32bdc81 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -2495,17 +2495,18 @@ GCCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
2495 | } | 2495 | } |
2496 | } | 2496 | } |
2497 | 2497 | ||
2498 | chq->rel->uniq = chq; | ||
2498 | chq->tq = GCT_send_prebuilt_message (message, ch->t, NULL, GNUNET_YES, | 2499 | chq->tq = GCT_send_prebuilt_message (message, ch->t, NULL, GNUNET_YES, |
2499 | &ch_message_sent, chq); | 2500 | &ch_message_sent, chq); |
2500 | if (NULL == chq->tq) | 2501 | if (NULL == chq->tq) |
2501 | { | 2502 | { |
2502 | GNUNET_break (0); | 2503 | GNUNET_break (0); |
2504 | chq->rel->uniq = NULL; | ||
2503 | GCT_debug (ch->t, GNUNET_ERROR_TYPE_ERROR); | 2505 | GCT_debug (ch->t, GNUNET_ERROR_TYPE_ERROR); |
2504 | GNUNET_free (chq); | 2506 | GNUNET_free (chq); |
2505 | chq = NULL; | 2507 | chq = NULL; |
2506 | return; | 2508 | return; |
2507 | } | 2509 | } |
2508 | chq->rel->uniq = chq; | ||
2509 | break; | 2510 | break; |
2510 | 2511 | ||
2511 | 2512 | ||
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index 5b07e42c0..6ddcf6598 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c | |||
@@ -1418,11 +1418,11 @@ send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
1418 | tq = existing_q; | 1418 | tq = existing_q; |
1419 | tq->tqd = NULL; | 1419 | tq->tqd = NULL; |
1420 | } | 1420 | } |
1421 | tq->cont = cont; | ||
1422 | tq->cont_cls = cont_cls; | ||
1421 | tq->cq = GCC_send_prebuilt_message (msg, type, mid, c, fwd, force, | 1423 | tq->cq = GCC_send_prebuilt_message (msg, type, mid, c, fwd, force, |
1422 | &tun_message_sent, tq); | 1424 | &tun_message_sent, tq); |
1423 | GNUNET_assert (NULL != tq->cq); | 1425 | GNUNET_assert (NULL != tq->cq); |
1424 | tq->cont = cont; | ||
1425 | tq->cont_cls = cont_cls; | ||
1426 | 1426 | ||
1427 | return tq; | 1427 | return tq; |
1428 | } | 1428 | } |