aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-05-23 14:57:20 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-05-23 14:57:20 +0000
commitd9caa899466a4151574cd4404fef70ade8ba7075 (patch)
tree545d5a6e1c3628f4afa56580f90bff39ccb19ad5 /src/transport
parentcd72df63ea82906dfab0b5a2b6a17efb75783ae5 (diff)
downloadgnunet-d9caa899466a4151574cd4404fef70ade8ba7075.tar.gz
gnunet-d9caa899466a4151574cd4404fef70ade8ba7075.zip
one '&' to break it all...
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/gnunet-service-transport_manipulation.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c
index 529cc26e1..e35672252 100644
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ b/src/transport/gnunet-service-transport_manipulation.c
@@ -361,6 +361,7 @@ send_delayed (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
361 361
362 if (NULL != tmp) 362 if (NULL != tmp)
363 { 363 {
364 GNUNET_break (GNUNET_YES == GST_neighbours_test_connected (&dqe->id));
364 tmp->send_delay_task = GNUNET_SCHEDULER_NO_TASK; 365 tmp->send_delay_task = GNUNET_SCHEDULER_NO_TASK;
365 GNUNET_CONTAINER_DLL_remove (tmp->send_head, tmp->send_tail, dqe); 366 GNUNET_CONTAINER_DLL_remove (tmp->send_head, tmp->send_tail, dqe);
366 GST_neighbours_send (&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, dqe->cont, dqe->cont_cls); 367 GST_neighbours_send (&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, dqe->cont, dqe->cont_cls);
@@ -375,7 +376,8 @@ send_delayed (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
375 } 376 }
376 else 377 else
377 { 378 {
378 /* Remove from generic queue */ 379 /* Remove from generic queue */
380 GNUNET_break (GNUNET_YES == GST_neighbours_test_connected (&dqe->id));
379 generic_send_delay_task = GNUNET_SCHEDULER_NO_TASK; 381 generic_send_delay_task = GNUNET_SCHEDULER_NO_TASK;
380 GNUNET_CONTAINER_DLL_remove (generic_dqe_head, generic_dqe_tail, dqe); 382 GNUNET_CONTAINER_DLL_remove (generic_dqe_head, generic_dqe_tail, dqe);
381 GST_neighbours_send (&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, dqe->cont, dqe->cont_cls); 383 GST_neighbours_send (&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, dqe->cont, dqe->cont_cls);
@@ -412,6 +414,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, const void *msg
412 414
413 if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &target->hashPubKey))) 415 if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &target->hashPubKey)))
414 { 416 {
417 GNUNET_break (GNUNET_YES == GST_neighbours_test_connected(target));
415 /* Manipulate here */ 418 /* Manipulate here */
416 /* Delay */ 419 /* Delay */
417 if (UINT32_MAX != find_metric(tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND)) 420 if (UINT32_MAX != find_metric(tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND))
@@ -439,6 +442,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, const void *msg
439 } 442 }
440 else if (UINT32_MAX != find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND)) 443 else if (UINT32_MAX != find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND))
441 { 444 {
445 GNUNET_break (GNUNET_YES == GST_neighbours_test_connected(target));
442 /* We have a delay */ 446 /* We have a delay */
443 delay.rel_value = find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND); 447 delay.rel_value = find_metric (&man_handle.general, GNUNET_ATS_QUALITY_NET_DELAY, TM_SEND);
444 dqe = GNUNET_malloc (sizeof (struct DelayQueueEntry) + msg_size); 448 dqe = GNUNET_malloc (sizeof (struct DelayQueueEntry) + msg_size);
@@ -672,7 +676,7 @@ GST_manipulation_peer_disconnect (const struct GNUNET_PeerIdentity *peer)
672 while (NULL != (dqe = next)) 676 while (NULL != (dqe = next))
673 { 677 {
674 next = dqe->next; 678 next = dqe->next;
675 if (0 == memcmp (&peer, &dqe->id, sizeof (dqe->id))) 679 if (0 == memcmp (peer, &dqe->id, sizeof (dqe->id)))
676 { 680 {
677 GNUNET_CONTAINER_DLL_remove (generic_dqe_head, generic_dqe_tail, dqe); 681 GNUNET_CONTAINER_DLL_remove (generic_dqe_head, generic_dqe_tail, dqe);
678 if (NULL != dqe->cont) 682 if (NULL != dqe->cont)