diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-30 12:27:11 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-30 12:27:11 +0100 |
commit | 48332ff7d4631f9be2a059c2fe150e3be5fb37f6 (patch) | |
tree | ec9da85c16ca25f37ffc4bb4d835360ffb6f134a /src/cadet/gnunet-service-cadet-new_tunnels.c | |
parent | c4d0522fd416da83f77475e2bb8351a7b5b72cc3 (diff) | |
download | gnunet-48332ff7d4631f9be2a059c2fe150e3be5fb37f6.tar.gz gnunet-48332ff7d4631f9be2a059c2fe150e3be5fb37f6.zip |
have tunnel tell channel which connection it used for transmission, so we can track connection performance by observing ACKs on the channel-level
Diffstat (limited to 'src/cadet/gnunet-service-cadet-new_tunnels.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet-new_tunnels.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c b/src/cadet/gnunet-service-cadet-new_tunnels.c index 1afd75bb2..5b44553ee 100644 --- a/src/cadet/gnunet-service-cadet-new_tunnels.c +++ b/src/cadet/gnunet-service-cadet-new_tunnels.c | |||
@@ -277,7 +277,7 @@ struct CadetTunnelQueueEntry | |||
277 | /** | 277 | /** |
278 | * Continuation to call once sent (on the channel layer). | 278 | * Continuation to call once sent (on the channel layer). |
279 | */ | 279 | */ |
280 | GNUNET_SCHEDULER_TaskCallback cont; | 280 | GCT_SendContinuation cont; |
281 | 281 | ||
282 | /** | 282 | /** |
283 | * Closure for @c cont. | 283 | * Closure for @c cont. |
@@ -2006,7 +2006,8 @@ destroy_tunnel (void *cls) | |||
2006 | while (NULL != (tq = t->tq_head)) | 2006 | while (NULL != (tq = t->tq_head)) |
2007 | { | 2007 | { |
2008 | if (NULL != tq->cont) | 2008 | if (NULL != tq->cont) |
2009 | tq->cont (tq->cont_cls); | 2009 | tq->cont (tq->cont_cls, |
2010 | NULL); | ||
2010 | GCT_send_cancel (tq); | 2011 | GCT_send_cancel (tq); |
2011 | } | 2012 | } |
2012 | GCP_drop_tunnel (t->destination, | 2013 | GCP_drop_tunnel (t->destination, |
@@ -2156,7 +2157,8 @@ try_send_normal_payload (struct CadetTunnel *t, | |||
2156 | GCC_transmit (ct->cc, | 2157 | GCC_transmit (ct->cc, |
2157 | tq->env); | 2158 | tq->env); |
2158 | if (NULL != tq->cont) | 2159 | if (NULL != tq->cont) |
2159 | tq->cont (tq->cont_cls); | 2160 | tq->cont (tq->cont_cls, |
2161 | GCC_get_id (ct->cc)); | ||
2160 | GNUNET_free (tq); | 2162 | GNUNET_free (tq); |
2161 | } | 2163 | } |
2162 | 2164 | ||
@@ -3114,7 +3116,7 @@ GCT_handle_encrypted (struct CadetTConnection *ct, | |||
3114 | struct CadetTunnelQueueEntry * | 3116 | struct CadetTunnelQueueEntry * |
3115 | GCT_send (struct CadetTunnel *t, | 3117 | GCT_send (struct CadetTunnel *t, |
3116 | const struct GNUNET_MessageHeader *message, | 3118 | const struct GNUNET_MessageHeader *message, |
3117 | GNUNET_SCHEDULER_TaskCallback cont, | 3119 | GCT_SendContinuation cont, |
3118 | void *cont_cls) | 3120 | void *cont_cls) |
3119 | { | 3121 | { |
3120 | struct CadetTunnelQueueEntry *tq; | 3122 | struct CadetTunnelQueueEntry *tq; |