diff options
Diffstat (limited to 'src/util/connection.c')
-rw-r--r-- | src/util/connection.c | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/src/util/connection.c b/src/util/connection.c index 066b81bbe..9bf2aa975 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -476,8 +476,6 @@ destroy_continuation (void *cls, | |||
476 | "Destroy waits for write_task to be done (%p)\n", sock); | 476 | "Destroy waits for write_task to be done (%p)\n", sock); |
477 | #endif | 477 | #endif |
478 | GNUNET_SCHEDULER_add_after (sock->sched, | 478 | GNUNET_SCHEDULER_add_after (sock->sched, |
479 | GNUNET_YES, | ||
480 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
481 | sock->write_task, | 479 | sock->write_task, |
482 | &destroy_continuation, sock); | 480 | &destroy_continuation, sock); |
483 | return; | 481 | return; |
@@ -498,8 +496,6 @@ destroy_continuation (void *cls, | |||
498 | if (sock->read_task != GNUNET_SCHEDULER_NO_TASK) | 496 | if (sock->read_task != GNUNET_SCHEDULER_NO_TASK) |
499 | { | 497 | { |
500 | GNUNET_SCHEDULER_add_after (sock->sched, | 498 | GNUNET_SCHEDULER_add_after (sock->sched, |
501 | GNUNET_YES, | ||
502 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
503 | sock->read_task, | 499 | sock->read_task, |
504 | &destroy_continuation, sock); | 500 | &destroy_continuation, sock); |
505 | return; | 501 | return; |
@@ -569,8 +565,6 @@ connect_fail_continuation (struct GNUNET_CONNECTION_Handle *h) | |||
569 | #endif | 565 | #endif |
570 | h->ccs -= COCO_RECEIVE_AGAIN; | 566 | h->ccs -= COCO_RECEIVE_AGAIN; |
571 | h->read_task = GNUNET_SCHEDULER_add_after (h->sched, | 567 | h->read_task = GNUNET_SCHEDULER_add_after (h->sched, |
572 | GNUNET_NO, | ||
573 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
574 | GNUNET_SCHEDULER_NO_TASK, | 568 | GNUNET_SCHEDULER_NO_TASK, |
575 | &receive_again, h); | 569 | &receive_again, h); |
576 | } | 570 | } |
@@ -586,8 +580,6 @@ connect_fail_continuation (struct GNUNET_CONNECTION_Handle *h) | |||
586 | h->nth.timeout_task = GNUNET_SCHEDULER_NO_TASK; | 580 | h->nth.timeout_task = GNUNET_SCHEDULER_NO_TASK; |
587 | h->ccs -= COCO_TRANSMIT_READY; | 581 | h->ccs -= COCO_TRANSMIT_READY; |
588 | h->write_task = GNUNET_SCHEDULER_add_after (h->sched, | 582 | h->write_task = GNUNET_SCHEDULER_add_after (h->sched, |
589 | GNUNET_NO, | ||
590 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
591 | GNUNET_SCHEDULER_NO_TASK, | 583 | GNUNET_SCHEDULER_NO_TASK, |
592 | &transmit_ready, h); | 584 | &transmit_ready, h); |
593 | } | 585 | } |
@@ -600,7 +592,6 @@ connect_fail_continuation (struct GNUNET_CONNECTION_Handle *h) | |||
600 | #endif | 592 | #endif |
601 | h->ccs -= COCO_DESTROY_CONTINUATION; | 593 | h->ccs -= COCO_DESTROY_CONTINUATION; |
602 | GNUNET_SCHEDULER_add_continuation (h->sched, | 594 | GNUNET_SCHEDULER_add_continuation (h->sched, |
603 | GNUNET_NO, | ||
604 | &destroy_continuation, | 595 | &destroy_continuation, |
605 | h, GNUNET_SCHEDULER_REASON_TIMEOUT); | 596 | h, GNUNET_SCHEDULER_REASON_TIMEOUT); |
606 | } | 597 | } |
@@ -630,8 +621,6 @@ connect_success_continuation (struct GNUNET_CONNECTION_Handle *h) | |||
630 | #endif | 621 | #endif |
631 | h->ccs -= COCO_RECEIVE_AGAIN; | 622 | h->ccs -= COCO_RECEIVE_AGAIN; |
632 | h->read_task = GNUNET_SCHEDULER_add_after (h->sched, | 623 | h->read_task = GNUNET_SCHEDULER_add_after (h->sched, |
633 | GNUNET_NO, | ||
634 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
635 | GNUNET_SCHEDULER_NO_TASK, | 624 | GNUNET_SCHEDULER_NO_TASK, |
636 | &receive_again, h); | 625 | &receive_again, h); |
637 | } | 626 | } |
@@ -648,9 +637,6 @@ connect_success_continuation (struct GNUNET_CONNECTION_Handle *h) | |||
648 | h->ccs -= COCO_TRANSMIT_READY; | 637 | h->ccs -= COCO_TRANSMIT_READY; |
649 | h->write_task = | 638 | h->write_task = |
650 | GNUNET_SCHEDULER_add_write_net (h->sched, | 639 | GNUNET_SCHEDULER_add_write_net (h->sched, |
651 | GNUNET_NO, | ||
652 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
653 | GNUNET_SCHEDULER_NO_TASK, | ||
654 | GNUNET_TIME_absolute_get_remaining | 640 | GNUNET_TIME_absolute_get_remaining |
655 | (h->nth.transmit_timeout), h->sock, | 641 | (h->nth.transmit_timeout), h->sock, |
656 | &transmit_ready, h); | 642 | &transmit_ready, h); |
@@ -664,7 +650,6 @@ connect_success_continuation (struct GNUNET_CONNECTION_Handle *h) | |||
664 | #endif | 650 | #endif |
665 | h->ccs -= COCO_DESTROY_CONTINUATION; | 651 | h->ccs -= COCO_DESTROY_CONTINUATION; |
666 | GNUNET_SCHEDULER_add_continuation (h->sched, | 652 | GNUNET_SCHEDULER_add_continuation (h->sched, |
667 | GNUNET_NO, | ||
668 | &destroy_continuation, | 653 | &destroy_continuation, |
669 | h, | 654 | h, |
670 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 655 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
@@ -808,9 +793,8 @@ try_connect_using_address (void *cls, | |||
808 | GNUNET_TIME_absolute_get_remaining (h-> | 793 | GNUNET_TIME_absolute_get_remaining (h-> |
809 | receive_timeout)); | 794 | receive_timeout)); |
810 | ap->task = | 795 | ap->task = |
811 | GNUNET_SCHEDULER_add_write_net (h->sched, GNUNET_NO, | 796 | GNUNET_SCHEDULER_add_write_net (h->sched, |
812 | GNUNET_SCHEDULER_PRIORITY_KEEP, | 797 | delay, ap->sock, |
813 | GNUNET_SCHEDULER_NO_TASK, delay, ap->sock, | ||
814 | &connect_probe_continuation, ap); | 798 | &connect_probe_continuation, ap); |
815 | } | 799 | } |
816 | 800 | ||
@@ -956,8 +940,6 @@ GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *sock) | |||
956 | } | 940 | } |
957 | GNUNET_assert (sock->sched != NULL); | 941 | GNUNET_assert (sock->sched != NULL); |
958 | GNUNET_SCHEDULER_add_after (sock->sched, | 942 | GNUNET_SCHEDULER_add_after (sock->sched, |
959 | GNUNET_YES, | ||
960 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
961 | GNUNET_SCHEDULER_NO_TASK, | 943 | GNUNET_SCHEDULER_NO_TASK, |
962 | &destroy_continuation, sock); | 944 | &destroy_continuation, sock); |
963 | } | 945 | } |
@@ -1101,9 +1083,6 @@ receive_again (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1101 | GNUNET_assert (sh->sock != NULL); | 1083 | GNUNET_assert (sh->sock != NULL); |
1102 | /* connect succeeded, wait for data! */ | 1084 | /* connect succeeded, wait for data! */ |
1103 | sh->read_task = GNUNET_SCHEDULER_add_read_net (tc->sched, | 1085 | sh->read_task = GNUNET_SCHEDULER_add_read_net (tc->sched, |
1104 | GNUNET_YES, | ||
1105 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
1106 | GNUNET_SCHEDULER_NO_TASK, | ||
1107 | GNUNET_TIME_absolute_get_remaining | 1086 | GNUNET_TIME_absolute_get_remaining |
1108 | (sh->receive_timeout), | 1087 | (sh->receive_timeout), |
1109 | sh->sock, | 1088 | sh->sock, |
@@ -1406,9 +1385,6 @@ SCHEDULE_WRITE: | |||
1406 | if (sock->write_task == GNUNET_SCHEDULER_NO_TASK) | 1385 | if (sock->write_task == GNUNET_SCHEDULER_NO_TASK) |
1407 | sock->write_task = | 1386 | sock->write_task = |
1408 | GNUNET_SCHEDULER_add_write_net (tc->sched, | 1387 | GNUNET_SCHEDULER_add_write_net (tc->sched, |
1409 | GNUNET_NO, | ||
1410 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
1411 | GNUNET_SCHEDULER_NO_TASK, | ||
1412 | GNUNET_TIME_absolute_get_remaining | 1388 | GNUNET_TIME_absolute_get_remaining |
1413 | (sock->nth.transmit_timeout), | 1389 | (sock->nth.transmit_timeout), |
1414 | sock->sock, &transmit_ready, sock); | 1390 | sock->sock, &transmit_ready, sock); |
@@ -1453,9 +1429,6 @@ GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_CONNECTION_Handle | |||
1453 | (sock->ap_head == NULL) && (sock->dns_active == NULL)) | 1429 | (sock->ap_head == NULL) && (sock->dns_active == NULL)) |
1454 | { | 1430 | { |
1455 | sock->write_task = GNUNET_SCHEDULER_add_delayed (sock->sched, | 1431 | sock->write_task = GNUNET_SCHEDULER_add_delayed (sock->sched, |
1456 | GNUNET_NO, | ||
1457 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
1458 | GNUNET_SCHEDULER_NO_TASK, | ||
1459 | GNUNET_TIME_UNIT_ZERO, | 1432 | GNUNET_TIME_UNIT_ZERO, |
1460 | &connect_error, sock); | 1433 | &connect_error, sock); |
1461 | return &sock->nth; | 1434 | return &sock->nth; |
@@ -1469,9 +1442,6 @@ GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_CONNECTION_Handle | |||
1469 | "Scheduling transmit_ready (%p).\n", sock); | 1442 | "Scheduling transmit_ready (%p).\n", sock); |
1470 | #endif | 1443 | #endif |
1471 | sock->write_task = GNUNET_SCHEDULER_add_write_net (sock->sched, | 1444 | sock->write_task = GNUNET_SCHEDULER_add_write_net (sock->sched, |
1472 | GNUNET_NO, | ||
1473 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
1474 | GNUNET_SCHEDULER_NO_TASK, | ||
1475 | GNUNET_TIME_absolute_get_remaining | 1445 | GNUNET_TIME_absolute_get_remaining |
1476 | (sock->nth. | 1446 | (sock->nth. |
1477 | transmit_timeout), | 1447 | transmit_timeout), |
@@ -1488,9 +1458,6 @@ GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_CONNECTION_Handle | |||
1488 | #endif | 1458 | #endif |
1489 | sock->ccs |= COCO_TRANSMIT_READY; | 1459 | sock->ccs |= COCO_TRANSMIT_READY; |
1490 | sock->nth.timeout_task = GNUNET_SCHEDULER_add_delayed (sock->sched, | 1460 | sock->nth.timeout_task = GNUNET_SCHEDULER_add_delayed (sock->sched, |
1491 | GNUNET_NO, | ||
1492 | GNUNET_SCHEDULER_PRIORITY_KEEP, | ||
1493 | GNUNET_SCHEDULER_NO_TASK, | ||
1494 | timeout, | 1461 | timeout, |
1495 | &transmit_timeout, | 1462 | &transmit_timeout, |
1496 | sock); | 1463 | sock); |