diff options
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 445fb4315..96d2001aa 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -1172,9 +1172,9 @@ update_addresses (struct TransportPlugin *plugin, int fresh) | |||
1172 | struct AddressList *next; | 1172 | struct AddressList *next; |
1173 | int expired; | 1173 | int expired; |
1174 | 1174 | ||
1175 | if (plugin->address_update_task != GNUNET_SCHEDULER_NO_PREREQUISITE_TASK) | 1175 | if (plugin->address_update_task != GNUNET_SCHEDULER_NO_TASK) |
1176 | GNUNET_SCHEDULER_cancel (plugin->env.sched, plugin->address_update_task); | 1176 | GNUNET_SCHEDULER_cancel (plugin->env.sched, plugin->address_update_task); |
1177 | plugin->address_update_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK; | 1177 | plugin->address_update_task = GNUNET_SCHEDULER_NO_TASK; |
1178 | now = GNUNET_TIME_absolute_get (); | 1178 | now = GNUNET_TIME_absolute_get (); |
1179 | min_remaining = GNUNET_TIME_UNIT_FOREVER_REL; | 1179 | min_remaining = GNUNET_TIME_UNIT_FOREVER_REL; |
1180 | expired = GNUNET_NO; | 1180 | expired = GNUNET_NO; |
@@ -1209,7 +1209,7 @@ update_addresses (struct TransportPlugin *plugin, int fresh) | |||
1209 | = GNUNET_SCHEDULER_add_delayed (plugin->env.sched, | 1209 | = GNUNET_SCHEDULER_add_delayed (plugin->env.sched, |
1210 | GNUNET_NO, | 1210 | GNUNET_NO, |
1211 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 1211 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
1212 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 1212 | GNUNET_SCHEDULER_NO_TASK, |
1213 | min_remaining, | 1213 | min_remaining, |
1214 | &expire_address_task, plugin); | 1214 | &expire_address_task, plugin); |
1215 | 1215 | ||
@@ -1226,7 +1226,7 @@ static void | |||
1226 | expire_address_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 1226 | expire_address_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
1227 | { | 1227 | { |
1228 | struct TransportPlugin *plugin = cls; | 1228 | struct TransportPlugin *plugin = cls; |
1229 | plugin->address_update_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK; | 1229 | plugin->address_update_task = GNUNET_SCHEDULER_NO_TASK; |
1230 | update_addresses (plugin, GNUNET_NO); | 1230 | update_addresses (plugin, GNUNET_NO); |
1231 | } | 1231 | } |
1232 | 1232 | ||
@@ -1513,7 +1513,7 @@ cleanup_validation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1513 | GNUNET_SCHEDULER_add_delayed (sched, | 1513 | GNUNET_SCHEDULER_add_delayed (sched, |
1514 | GNUNET_NO, | 1514 | GNUNET_NO, |
1515 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 1515 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
1516 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 1516 | GNUNET_SCHEDULER_NO_TASK, |
1517 | GNUNET_TIME_absolute_get_remaining | 1517 | GNUNET_TIME_absolute_get_remaining |
1518 | (pos->timeout), &cleanup_validation, NULL); | 1518 | (pos->timeout), &cleanup_validation, NULL); |
1519 | } | 1519 | } |
@@ -1608,7 +1608,7 @@ plugin_env_notify_validation (void *cls, | |||
1608 | GNUNET_SCHEDULER_add_delayed (sched, | 1608 | GNUNET_SCHEDULER_add_delayed (sched, |
1609 | GNUNET_NO, | 1609 | GNUNET_NO, |
1610 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 1610 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
1611 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 1611 | GNUNET_SCHEDULER_NO_TASK, |
1612 | GNUNET_TIME_UNIT_ZERO, | 1612 | GNUNET_TIME_UNIT_ZERO, |
1613 | &cleanup_validation, NULL); | 1613 | &cleanup_validation, NULL); |
1614 | } | 1614 | } |
@@ -1757,7 +1757,7 @@ check_hello_validated (void *cls, | |||
1757 | GNUNET_SCHEDULER_add_delayed (sched, | 1757 | GNUNET_SCHEDULER_add_delayed (sched, |
1758 | GNUNET_NO, | 1758 | GNUNET_NO, |
1759 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 1759 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
1760 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 1760 | GNUNET_SCHEDULER_NO_TASK, |
1761 | GNUNET_TIME_absolute_get_remaining | 1761 | GNUNET_TIME_absolute_get_remaining |
1762 | (chvc->e->timeout), &cleanup_validation, | 1762 | (chvc->e->timeout), &cleanup_validation, |
1763 | NULL); | 1763 | NULL); |
@@ -1920,7 +1920,7 @@ disconnect_neighbour (struct NeighbourList *n, | |||
1920 | GNUNET_assert (mq->neighbour == n); | 1920 | GNUNET_assert (mq->neighbour == n); |
1921 | GNUNET_free (mq); | 1921 | GNUNET_free (mq); |
1922 | } | 1922 | } |
1923 | if (n->timeout_task != GNUNET_SCHEDULER_NO_PREREQUISITE_TASK) | 1923 | if (n->timeout_task != GNUNET_SCHEDULER_NO_TASK) |
1924 | GNUNET_SCHEDULER_cancel (sched, | 1924 | GNUNET_SCHEDULER_cancel (sched, |
1925 | n->timeout_task); | 1925 | n->timeout_task); |
1926 | /* finally, free n itself */ | 1926 | /* finally, free n itself */ |
@@ -1971,7 +1971,7 @@ neighbour_timeout_task (void *cls, | |||
1971 | "Neighbour `%4s' has timed out!\n", | 1971 | "Neighbour `%4s' has timed out!\n", |
1972 | GNUNET_i2s(&n->id)); | 1972 | GNUNET_i2s(&n->id)); |
1973 | #endif | 1973 | #endif |
1974 | n->timeout_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK; | 1974 | n->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
1975 | disconnect_neighbour (n, GNUNET_NO); | 1975 | disconnect_neighbour (n, GNUNET_NO); |
1976 | } | 1976 | } |
1977 | 1977 | ||
@@ -2007,7 +2007,7 @@ setup_new_neighbour (const struct GNUNET_PeerIdentity *peer) | |||
2007 | n->timeout_task = GNUNET_SCHEDULER_add_delayed (sched, | 2007 | n->timeout_task = GNUNET_SCHEDULER_add_delayed (sched, |
2008 | GNUNET_NO, | 2008 | GNUNET_NO, |
2009 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 2009 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
2010 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 2010 | GNUNET_SCHEDULER_NO_TASK, |
2011 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2011 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2012 | &neighbour_timeout_task, n); | 2012 | &neighbour_timeout_task, n); |
2013 | transmit_to_peer (NULL, 0, | 2013 | transmit_to_peer (NULL, 0, |
@@ -2120,7 +2120,7 @@ plugin_env_receive (void *cls, | |||
2120 | n->timeout_task = | 2120 | n->timeout_task = |
2121 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_NO, | 2121 | GNUNET_SCHEDULER_add_delayed (sched, GNUNET_NO, |
2122 | GNUNET_SCHEDULER_PRIORITY_IDLE, | 2122 | GNUNET_SCHEDULER_PRIORITY_IDLE, |
2123 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 2123 | GNUNET_SCHEDULER_NO_TASK, |
2124 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2124 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2125 | &neighbour_timeout_task, n); | 2125 | &neighbour_timeout_task, n); |
2126 | update_quota (n); | 2126 | update_quota (n); |