aboutsummaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_wlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/plugin_transport_wlan.c')
-rw-r--r--src/transport/plugin_transport_wlan.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index ab9fa4a74..b0be34346 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -204,7 +204,7 @@ struct PendingMessage
204 /** 204 /**
205 * Timeout task (for this message). 205 * Timeout task (for this message).
206 */ 206 */
207 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 207 struct GNUNET_SCHEDULER_Task * timeout_task;
208 208
209}; 209};
210 210
@@ -250,7 +250,7 @@ struct Session
250 /** 250 /**
251 * Timeout task (for the session). 251 * Timeout task (for the session).
252 */ 252 */
253 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 253 struct GNUNET_SCHEDULER_Task * timeout_task;
254 254
255}; 255};
256 256
@@ -300,7 +300,7 @@ struct FragmentMessage
300 /** 300 /**
301 * Timeout task. 301 * Timeout task.
302 */ 302 */
303 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 303 struct GNUNET_SCHEDULER_Task * timeout_task;
304 304
305 /** 305 /**
306 * Continuation to call when we're done with this message. 306 * Continuation to call when we're done with this message.
@@ -379,7 +379,7 @@ struct MacEndpoint
379 /** 379 /**
380 * Timeout task. 380 * Timeout task.
381 */ 381 */
382 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 382 struct GNUNET_SCHEDULER_Task * timeout_task;
383 383
384 /** 384 /**
385 * count of messages in the fragment out queue for this mac endpoint 385 * count of messages in the fragment out queue for this mac endpoint
@@ -484,7 +484,7 @@ struct Plugin
484 /** 484 /**
485 * Task that periodically sends a HELLO beacon via the helper. 485 * Task that periodically sends a HELLO beacon via the helper.
486 */ 486 */
487 GNUNET_SCHEDULER_TaskIdentifier beacon_task; 487 struct GNUNET_SCHEDULER_Task * beacon_task;
488 488
489 /** 489 /**
490 * Tracker for bandwidth limit 490 * Tracker for bandwidth limit
@@ -777,10 +777,10 @@ wlan_plugin_disconnect_session (void *cls,
777 GNUNET_CONTAINER_DLL_remove (endpoint->sessions_head, 777 GNUNET_CONTAINER_DLL_remove (endpoint->sessions_head,
778 endpoint->sessions_tail, 778 endpoint->sessions_tail,
779 session); 779 session);
780 if (session->timeout_task != GNUNET_SCHEDULER_NO_TASK) 780 if (session->timeout_task != NULL)
781 { 781 {
782 GNUNET_SCHEDULER_cancel (session->timeout_task); 782 GNUNET_SCHEDULER_cancel (session->timeout_task);
783 session->timeout_task = GNUNET_SCHEDULER_NO_TASK; 783 session->timeout_task = NULL;
784 } 784 }
785 GNUNET_STATISTICS_update (plugin->env->stats, 785 GNUNET_STATISTICS_update (plugin->env->stats,
786 _("# Sessions allocated"), 786 _("# Sessions allocated"),
@@ -820,7 +820,7 @@ session_timeout (void *cls,
820 struct Session *session = cls; 820 struct Session *session = cls;
821 struct GNUNET_TIME_Relative left; 821 struct GNUNET_TIME_Relative left;
822 822
823 session->timeout_task = GNUNET_SCHEDULER_NO_TASK; 823 session->timeout_task = NULL;
824 left = GNUNET_TIME_absolute_get_remaining (session->timeout); 824 left = GNUNET_TIME_absolute_get_remaining (session->timeout);
825 if (0 != left.rel_value_us) 825 if (0 != left.rel_value_us)
826 { 826 {
@@ -1025,10 +1025,10 @@ free_fragment_message (struct FragmentMessage *fm)
1025 GNUNET_FRAGMENT_context_destroy (fm->fragcontext, 1025 GNUNET_FRAGMENT_context_destroy (fm->fragcontext,
1026 &endpoint->msg_delay, 1026 &endpoint->msg_delay,
1027 &endpoint->ack_delay); 1027 &endpoint->ack_delay);
1028 if (fm->timeout_task != GNUNET_SCHEDULER_NO_TASK) 1028 if (fm->timeout_task != NULL)
1029 { 1029 {
1030 GNUNET_SCHEDULER_cancel (fm->timeout_task); 1030 GNUNET_SCHEDULER_cancel (fm->timeout_task);
1031 fm->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1031 fm->timeout_task = NULL;
1032 } 1032 }
1033 GNUNET_free (fm); 1033 GNUNET_free (fm);
1034} 1034}
@@ -1046,7 +1046,7 @@ fragmentmessage_timeout (void *cls,
1046{ 1046{
1047 struct FragmentMessage *fm = cls; 1047 struct FragmentMessage *fm = cls;
1048 1048
1049 fm->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1049 fm->timeout_task = NULL;
1050 if (NULL != fm->cont) 1050 if (NULL != fm->cont)
1051 { 1051 {
1052 fm->cont (fm->cont_cls, 1052 fm->cont (fm->cont_cls,
@@ -1145,10 +1145,10 @@ free_macendpoint (struct MacEndpoint *endpoint)
1145 } 1145 }
1146 1146
1147 plugin->mac_count--; 1147 plugin->mac_count--;
1148 if (GNUNET_SCHEDULER_NO_TASK != endpoint->timeout_task) 1148 if (NULL != endpoint->timeout_task)
1149 { 1149 {
1150 GNUNET_SCHEDULER_cancel (endpoint->timeout_task); 1150 GNUNET_SCHEDULER_cancel (endpoint->timeout_task);
1151 endpoint->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1151 endpoint->timeout_task = NULL;
1152 } 1152 }
1153 GNUNET_free (endpoint); 1153 GNUNET_free (endpoint);
1154} 1154}
@@ -1167,7 +1167,7 @@ macendpoint_timeout (void *cls,
1167 struct MacEndpoint *endpoint = cls; 1167 struct MacEndpoint *endpoint = cls;
1168 struct GNUNET_TIME_Relative timeout; 1168 struct GNUNET_TIME_Relative timeout;
1169 1169
1170 endpoint->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1170 endpoint->timeout_task = NULL;
1171 timeout = GNUNET_TIME_absolute_get_remaining (endpoint->timeout); 1171 timeout = GNUNET_TIME_absolute_get_remaining (endpoint->timeout);
1172 if (0 == timeout.rel_value_us) 1172 if (0 == timeout.rel_value_us)
1173 { 1173 {
@@ -1923,10 +1923,10 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
1923 GNUNET_HELLO_address_free (address); 1923 GNUNET_HELLO_address_free (address);
1924 } 1924 }
1925 1925
1926 if (GNUNET_SCHEDULER_NO_TASK != plugin->beacon_task) 1926 if (NULL != plugin->beacon_task)
1927 { 1927 {
1928 GNUNET_SCHEDULER_cancel (plugin->beacon_task); 1928 GNUNET_SCHEDULER_cancel (plugin->beacon_task);
1929 plugin->beacon_task = GNUNET_SCHEDULER_NO_TASK; 1929 plugin->beacon_task = NULL;
1930 } 1930 }
1931 if (NULL != plugin->suid_helper) 1931 if (NULL != plugin->suid_helper)
1932 { 1932 {
@@ -2077,7 +2077,7 @@ wlan_plugin_update_session_timeout (void *cls,
2077 const struct GNUNET_PeerIdentity *peer, 2077 const struct GNUNET_PeerIdentity *peer,
2078 struct Session *session) 2078 struct Session *session)
2079{ 2079{
2080 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != session->timeout_task); 2080 GNUNET_assert (NULL != session->timeout_task);
2081 session->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); 2081 session->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
2082} 2082}
2083 2083