diff options
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 0dc3f859d..efe53e021 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -710,9 +710,9 @@ transmit_to_client_callback (void *cls, size_t size, void *buf) | |||
710 | GNUNET_free (q); | 710 | GNUNET_free (q); |
711 | client->message_count--; | 711 | client->message_count--; |
712 | } | 712 | } |
713 | GNUNET_assert (tsize > 0); | ||
714 | if (NULL != q) | 713 | if (NULL != q) |
715 | { | 714 | { |
715 | GNUNET_assert (msize >= sizeof (struct GNUNET_MessageHeader)); | ||
716 | th = GNUNET_SERVER_notify_transmit_ready (client->client, | 716 | th = GNUNET_SERVER_notify_transmit_ready (client->client, |
717 | msize, | 717 | msize, |
718 | GNUNET_TIME_UNIT_FOREVER_REL, | 718 | GNUNET_TIME_UNIT_FOREVER_REL, |
@@ -753,6 +753,7 @@ transmit_to_client (struct TransportClient *client, | |||
753 | } | 753 | } |
754 | client->message_count++; | 754 | client->message_count++; |
755 | msize = ntohs (msg->size); | 755 | msize = ntohs (msg->size); |
756 | GNUNET_assert (msize >= sizeof (struct GNUNET_MessageHeader)); | ||
756 | q = GNUNET_malloc (sizeof (struct ClientMessageQueueEntry) + msize); | 757 | q = GNUNET_malloc (sizeof (struct ClientMessageQueueEntry) + msize); |
757 | memcpy (&q[1], msg, msize); | 758 | memcpy (&q[1], msg, msize); |
758 | /* append to message queue */ | 759 | /* append to message queue */ |
@@ -1217,9 +1218,6 @@ update_addresses (struct TransportPlugin *plugin, int fresh) | |||
1217 | if (min_remaining.value < GNUNET_TIME_UNIT_FOREVER_REL.value) | 1218 | if (min_remaining.value < GNUNET_TIME_UNIT_FOREVER_REL.value) |
1218 | plugin->address_update_task | 1219 | plugin->address_update_task |
1219 | = GNUNET_SCHEDULER_add_delayed (plugin->env.sched, | 1220 | = GNUNET_SCHEDULER_add_delayed (plugin->env.sched, |
1220 | GNUNET_NO, | ||
1221 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
1222 | GNUNET_SCHEDULER_NO_TASK, | ||
1223 | min_remaining, | 1221 | min_remaining, |
1224 | &expire_address_task, plugin); | 1222 | &expire_address_task, plugin); |
1225 | 1223 | ||
@@ -1527,9 +1525,6 @@ cleanup_validation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1527 | pos = pos->next; | 1525 | pos = pos->next; |
1528 | } | 1526 | } |
1529 | GNUNET_SCHEDULER_add_delayed (sched, | 1527 | GNUNET_SCHEDULER_add_delayed (sched, |
1530 | GNUNET_NO, | ||
1531 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
1532 | GNUNET_SCHEDULER_NO_TASK, | ||
1533 | GNUNET_TIME_absolute_get_remaining (first), | 1528 | GNUNET_TIME_absolute_get_remaining (first), |
1534 | &cleanup_validation, NULL); | 1529 | &cleanup_validation, NULL); |
1535 | } | 1530 | } |
@@ -1631,12 +1626,9 @@ plugin_env_notify_validation (void *cls, | |||
1631 | GNUNET_i2s (peer)); | 1626 | GNUNET_i2s (peer)); |
1632 | #endif | 1627 | #endif |
1633 | pos->timeout.value = 0; | 1628 | pos->timeout.value = 0; |
1634 | GNUNET_SCHEDULER_add_delayed (sched, | 1629 | GNUNET_SCHEDULER_add_with_priority (sched, |
1635 | GNUNET_NO, | 1630 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
1636 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 1631 | &cleanup_validation, NULL); |
1637 | GNUNET_SCHEDULER_NO_TASK, | ||
1638 | GNUNET_TIME_UNIT_ZERO, | ||
1639 | &cleanup_validation, NULL); | ||
1640 | } | 1632 | } |
1641 | else | 1633 | else |
1642 | { | 1634 | { |
@@ -1798,9 +1790,6 @@ check_hello_validated (void *cls, | |||
1798 | va = va->next; | 1790 | va = va->next; |
1799 | } | 1791 | } |
1800 | GNUNET_SCHEDULER_add_delayed (sched, | 1792 | GNUNET_SCHEDULER_add_delayed (sched, |
1801 | GNUNET_NO, | ||
1802 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
1803 | GNUNET_SCHEDULER_NO_TASK, | ||
1804 | GNUNET_TIME_absolute_get_remaining (chvc->e->timeout), | 1793 | GNUNET_TIME_absolute_get_remaining (chvc->e->timeout), |
1805 | &cleanup_validation, NULL); | 1794 | &cleanup_validation, NULL); |
1806 | GNUNET_free (chvc); | 1795 | GNUNET_free (chvc); |
@@ -2047,9 +2036,6 @@ setup_new_neighbour (const struct GNUNET_PeerIdentity *peer) | |||
2047 | n->quota_in = (GNUNET_CONSTANTS_DEFAULT_BPM_IN_OUT + 59999) / (60 * 1000); | 2036 | n->quota_in = (GNUNET_CONSTANTS_DEFAULT_BPM_IN_OUT + 59999) / (60 * 1000); |
2048 | add_plugins (n); | 2037 | add_plugins (n); |
2049 | n->timeout_task = GNUNET_SCHEDULER_add_delayed (sched, | 2038 | n->timeout_task = GNUNET_SCHEDULER_add_delayed (sched, |
2050 | GNUNET_NO, | ||
2051 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
2052 | GNUNET_SCHEDULER_NO_TASK, | ||
2053 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2039 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2054 | &neighbour_timeout_task, n); | 2040 | &neighbour_timeout_task, n); |
2055 | transmit_to_peer (NULL, 0, | 2041 | transmit_to_peer (NULL, 0, |
@@ -2161,9 +2147,7 @@ plugin_env_receive (void *cls, | |||
2161 | n->peer_timeout = | 2147 | n->peer_timeout = |
2162 | GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); | 2148 | GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); |
2163 | n->timeout_task = | 2149 | n->timeout_task = |
2164 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_NO, | 2150 | GNUNET_SCHEDULER_add_delayed (sched, |
2165 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
2166 | GNUNET_SCHEDULER_NO_TASK, | ||
2167 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2151 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2168 | &neighbour_timeout_task, n); | 2152 | &neighbour_timeout_task, n); |
2169 | update_quota (n); | 2153 | update_quota (n); |
@@ -2698,9 +2682,6 @@ run (void *cls, | |||
2698 | GNUNET_free (plugs); | 2682 | GNUNET_free (plugs); |
2699 | } | 2683 | } |
2700 | GNUNET_SCHEDULER_add_delayed (sched, | 2684 | GNUNET_SCHEDULER_add_delayed (sched, |
2701 | GNUNET_YES, | ||
2702 | GNUNET_SCHEDULER_PRIORITY_IDLE, | ||
2703 | GNUNET_SCHEDULER_NO_TASK, | ||
2704 | GNUNET_TIME_UNIT_FOREVER_REL, | 2685 | GNUNET_TIME_UNIT_FOREVER_REL, |
2705 | &unload_plugins, NULL); | 2686 | &unload_plugins, NULL); |
2706 | if (no_transports) | 2687 | if (no_transports) |
@@ -2728,7 +2709,7 @@ main (int argc, char *const *argv) | |||
2728 | GNUNET_SERVICE_run (argc, | 2709 | GNUNET_SERVICE_run (argc, |
2729 | argv, | 2710 | argv, |
2730 | "transport", | 2711 | "transport", |
2731 | &run, NULL, NULL, NULL)) ? 0 : 1; | 2712 | &run, NULL)) ? 0 : 1; |
2732 | } | 2713 | } |
2733 | 2714 | ||
2734 | /* end of gnunet-service-transport.c */ | 2715 | /* end of gnunet-service-transport.c */ |