diff options
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 021a647ad..4f7b57641 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -269,7 +269,7 @@ struct Session | |||
269 | /** | 269 | /** |
270 | * Task cleaning up a NAT client connection establishment attempt; | 270 | * Task cleaning up a NAT client connection establishment attempt; |
271 | */ | 271 | */ |
272 | GNUNET_SCHEDULER_TaskIdentifier nat_connection_timeout; | 272 | struct GNUNET_SCHEDULER_Task * nat_connection_timeout; |
273 | 273 | ||
274 | /** | 274 | /** |
275 | * Messages currently pending for transmission | 275 | * Messages currently pending for transmission |
@@ -296,12 +296,12 @@ struct Session | |||
296 | /** | 296 | /** |
297 | * ID of task used to delay receiving more to throttle sender. | 297 | * ID of task used to delay receiving more to throttle sender. |
298 | */ | 298 | */ |
299 | GNUNET_SCHEDULER_TaskIdentifier receive_delay_task; | 299 | struct GNUNET_SCHEDULER_Task * receive_delay_task; |
300 | 300 | ||
301 | /** | 301 | /** |
302 | * Session timeout task | 302 | * Session timeout task |
303 | */ | 303 | */ |
304 | GNUNET_SCHEDULER_TaskIdentifier timeout_task; | 304 | struct GNUNET_SCHEDULER_Task * timeout_task; |
305 | 305 | ||
306 | /** | 306 | /** |
307 | * When will this session time out? | 307 | * When will this session time out? |
@@ -435,7 +435,7 @@ struct Plugin | |||
435 | /** | 435 | /** |
436 | * ID of task used to update our addresses when one expires. | 436 | * ID of task used to update our addresses when one expires. |
437 | */ | 437 | */ |
438 | GNUNET_SCHEDULER_TaskIdentifier address_update_task; | 438 | struct GNUNET_SCHEDULER_Task * address_update_task; |
439 | 439 | ||
440 | /** | 440 | /** |
441 | * Address options | 441 | * Address options |
@@ -480,7 +480,7 @@ notify_session_monitor (struct Plugin *plugin, | |||
480 | : GNUNET_NO; | 480 | : GNUNET_NO; |
481 | info.num_msg_pending = session->msgs_in_queue; | 481 | info.num_msg_pending = session->msgs_in_queue; |
482 | info.num_bytes_pending = session->bytes_in_queue; | 482 | info.num_bytes_pending = session->bytes_in_queue; |
483 | if (GNUNET_SCHEDULER_NO_TASK != session->receive_delay_task) | 483 | if (NULL != session->receive_delay_task) |
484 | info.receive_delay = session->receive_delay; | 484 | info.receive_delay = session->receive_delay; |
485 | info.session_timeout = session->timeout; | 485 | info.session_timeout = session->timeout; |
486 | info.address = session->address; | 486 | info.address = session->address; |
@@ -813,10 +813,10 @@ tcp_plugin_disconnect_session (void *cls, | |||
813 | session->address->address, | 813 | session->address->address, |
814 | session->address->address_length)); | 814 | session->address->address_length)); |
815 | 815 | ||
816 | if (GNUNET_SCHEDULER_NO_TASK != session->timeout_task) | 816 | if (NULL != session->timeout_task) |
817 | { | 817 | { |
818 | GNUNET_SCHEDULER_cancel (session->timeout_task); | 818 | GNUNET_SCHEDULER_cancel (session->timeout_task); |
819 | session->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 819 | session->timeout_task = NULL; |
820 | session->timeout = GNUNET_TIME_UNIT_ZERO_ABS; | 820 | session->timeout = GNUNET_TIME_UNIT_ZERO_ABS; |
821 | } | 821 | } |
822 | 822 | ||
@@ -853,10 +853,10 @@ tcp_plugin_disconnect_session (void *cls, | |||
853 | session->address, | 853 | session->address, |
854 | session); | 854 | session); |
855 | 855 | ||
856 | if (GNUNET_SCHEDULER_NO_TASK != session->nat_connection_timeout) | 856 | if (NULL != session->nat_connection_timeout) |
857 | { | 857 | { |
858 | GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); | 858 | GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); |
859 | session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK; | 859 | session->nat_connection_timeout = NULL; |
860 | } | 860 | } |
861 | 861 | ||
862 | while (NULL != (pm = session->pending_messages_head)) | 862 | while (NULL != (pm = session->pending_messages_head)) |
@@ -894,7 +894,7 @@ tcp_plugin_disconnect_session (void *cls, | |||
894 | session, | 894 | session, |
895 | GNUNET_TRANSPORT_SS_DONE); | 895 | GNUNET_TRANSPORT_SS_DONE); |
896 | 896 | ||
897 | if (session->receive_delay_task != GNUNET_SCHEDULER_NO_TASK) | 897 | if (session->receive_delay_task != NULL) |
898 | { | 898 | { |
899 | GNUNET_SCHEDULER_cancel (session->receive_delay_task); | 899 | GNUNET_SCHEDULER_cancel (session->receive_delay_task); |
900 | if (NULL != session->client) | 900 | if (NULL != session->client) |
@@ -941,7 +941,7 @@ session_timeout (void *cls, | |||
941 | struct Session *s = cls; | 941 | struct Session *s = cls; |
942 | struct GNUNET_TIME_Relative left; | 942 | struct GNUNET_TIME_Relative left; |
943 | 943 | ||
944 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 944 | s->timeout_task = NULL; |
945 | left = GNUNET_TIME_absolute_get_remaining (s->timeout); | 945 | left = GNUNET_TIME_absolute_get_remaining (s->timeout); |
946 | if (0 != left.rel_value_us) | 946 | if (0 != left.rel_value_us) |
947 | { | 947 | { |
@@ -973,7 +973,7 @@ session_timeout (void *cls, | |||
973 | static void | 973 | static void |
974 | reschedule_session_timeout (struct Session *s) | 974 | reschedule_session_timeout (struct Session *s) |
975 | { | 975 | { |
976 | GNUNET_assert(GNUNET_SCHEDULER_NO_TASK != s->timeout_task); | 976 | GNUNET_assert(NULL != s->timeout_task); |
977 | s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); | 977 | s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); |
978 | } | 978 | } |
979 | 979 | ||
@@ -1417,7 +1417,7 @@ nat_connect_timeout (void *cls, | |||
1417 | { | 1417 | { |
1418 | struct Session *session = cls; | 1418 | struct Session *session = cls; |
1419 | 1419 | ||
1420 | session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK; | 1420 | session->nat_connection_timeout = NULL; |
1421 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1421 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1422 | "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n", | 1422 | "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n", |
1423 | GNUNET_i2s (&session->target), | 1423 | GNUNET_i2s (&session->target), |
@@ -1460,7 +1460,7 @@ delayed_done (void *cls, | |||
1460 | { | 1460 | { |
1461 | struct Session *session = cls; | 1461 | struct Session *session = cls; |
1462 | 1462 | ||
1463 | session->receive_delay_task = GNUNET_SCHEDULER_NO_TASK; | 1463 | session->receive_delay_task = NULL; |
1464 | reschedule_session_timeout (session); | 1464 | reschedule_session_timeout (session); |
1465 | 1465 | ||
1466 | GNUNET_SERVER_receive_done (session->client, GNUNET_OK); | 1466 | GNUNET_SERVER_receive_done (session->client, GNUNET_OK); |
@@ -1483,7 +1483,7 @@ tcp_plugin_update_inbound_delay (void *cls, | |||
1483 | struct Session *session, | 1483 | struct Session *session, |
1484 | struct GNUNET_TIME_Relative delay) | 1484 | struct GNUNET_TIME_Relative delay) |
1485 | { | 1485 | { |
1486 | if (GNUNET_SCHEDULER_NO_TASK == session->receive_delay_task) | 1486 | if (NULL == session->receive_delay_task) |
1487 | return; | 1487 | return; |
1488 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1488 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1489 | "New inbound delay %s\n", | 1489 | "New inbound delay %s\n", |
@@ -1846,7 +1846,7 @@ struct PrettyPrinterContext | |||
1846 | /** | 1846 | /** |
1847 | * Timeout task | 1847 | * Timeout task |
1848 | */ | 1848 | */ |
1849 | GNUNET_SCHEDULER_TaskIdentifier timeout_task; | 1849 | struct GNUNET_SCHEDULER_Task * timeout_task; |
1850 | 1850 | ||
1851 | /** | 1851 | /** |
1852 | * Resolver handle | 1852 | * Resolver handle |
@@ -2166,10 +2166,10 @@ handle_tcp_nat_probe (void *cls, | |||
2166 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2166 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2167 | "Found session for NAT probe!\n"); | 2167 | "Found session for NAT probe!\n"); |
2168 | 2168 | ||
2169 | if (session->nat_connection_timeout != GNUNET_SCHEDULER_NO_TASK) | 2169 | if (session->nat_connection_timeout != NULL) |
2170 | { | 2170 | { |
2171 | GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); | 2171 | GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); |
2172 | session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK; | 2172 | session->nat_connection_timeout = NULL; |
2173 | } | 2173 | } |
2174 | 2174 | ||
2175 | if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) | 2175 | if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) |