diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-27 22:05:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-27 22:05:16 +0000 |
commit | 59f1c0b2c8ce36eba968d27c7d3985b4008520b7 (patch) | |
tree | 445fc4ac85de64351d1d50ec43a1d2e47ae1abcd /src/transport/plugin_transport_tcp.c | |
parent | 2eebe4ddf4e1fdd87d04112f94eb89bd755b3588 (diff) | |
download | gnunet-59f1c0b2c8ce36eba968d27c7d3985b4008520b7.tar.gz gnunet-59f1c0b2c8ce36eba968d27c7d3985b4008520b7.zip |
-minor code cleanups
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 90bb4bc51..2c11a7e32 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -2132,15 +2132,14 @@ session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
2132 | struct Session *s = cls; | 2132 | struct Session *s = cls; |
2133 | 2133 | ||
2134 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 2134 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
2135 | 2135 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2136 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p was idle for %llu, disconnecting\n", | 2136 | "Session %p was idle for %llu, disconnecting\n", |
2137 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2137 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2138 | |||
2139 | /* call session destroy function */ | 2138 | /* call session destroy function */ |
2140 | disconnect_session(s); | 2139 | disconnect_session(s); |
2141 | |||
2142 | } | 2140 | } |
2143 | 2141 | ||
2142 | |||
2144 | /** | 2143 | /** |
2145 | * Start session timeout | 2144 | * Start session timeout |
2146 | */ | 2145 | */ |
@@ -2149,15 +2148,16 @@ start_session_timeout (struct Session *s) | |||
2149 | { | 2148 | { |
2150 | GNUNET_assert (NULL != s); | 2149 | GNUNET_assert (NULL != s); |
2151 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); | 2150 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); |
2152 | |||
2153 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2151 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2154 | &session_timeout, | 2152 | &session_timeout, |
2155 | s); | 2153 | s); |
2156 | 2154 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2157 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p set to %llu\n", | 2155 | "Timeout for session %p set to %llu\n", |
2158 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2156 | s, |
2157 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | ||
2159 | } | 2158 | } |
2160 | 2159 | ||
2160 | |||
2161 | /** | 2161 | /** |
2162 | * Increment session timeout due to activity | 2162 | * Increment session timeout due to activity |
2163 | */ | 2163 | */ |
@@ -2167,22 +2167,22 @@ reschedule_session_timeout (struct Session *s) | |||
2167 | GNUNET_assert (NULL != s); | 2167 | GNUNET_assert (NULL != s); |
2168 | if (GNUNET_SCHEDULER_NO_TASK == s->timeout_task) | 2168 | if (GNUNET_SCHEDULER_NO_TASK == s->timeout_task) |
2169 | { | 2169 | { |
2170 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout for peer `%s' %s not scheduled\n", | 2170 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2171 | GNUNET_i2s (&s->target), tcp_address_to_string(NULL, s->addr, s->addrlen)); | 2171 | "Timeout for peer `%s' %s not scheduled\n", |
2172 | GNUNET_i2s (&s->target), | ||
2173 | tcp_address_to_string(NULL, s->addr, s->addrlen)); | ||
2172 | return; | 2174 | return; |
2173 | } | 2175 | } |
2174 | |||
2175 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task); | ||
2176 | |||
2177 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 2176 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
2178 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2177 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2179 | &session_timeout, | 2178 | &session_timeout, |
2180 | s); | 2179 | s); |
2181 | |||
2182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n", | 2180 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n", |
2183 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2181 | s, |
2182 | (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | ||
2184 | } | 2183 | } |
2185 | 2184 | ||
2185 | |||
2186 | /** | 2186 | /** |
2187 | * Cancel timeout | 2187 | * Cancel timeout |
2188 | */ | 2188 | */ |
@@ -2190,19 +2190,19 @@ static void | |||
2190 | stop_session_timeout (struct Session *s) | 2190 | stop_session_timeout (struct Session *s) |
2191 | { | 2191 | { |
2192 | GNUNET_assert (NULL != s); | 2192 | GNUNET_assert (NULL != s); |
2193 | |||
2194 | if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) | 2193 | if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) |
2195 | { | 2194 | { |
2196 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 2195 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
2197 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 2196 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
2198 | 2197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2199 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p canceled\n", | 2198 | "Timeout rescheduled for session %p canceled\n", |
2200 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2199 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2201 | } | 2200 | } |
2202 | else | 2201 | else |
2203 | { | 2202 | { |
2204 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p was not active\n", | 2203 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2205 | s); | 2204 | "Timeout for session %p was not active\n", |
2205 | s); | ||
2206 | } | 2206 | } |
2207 | } | 2207 | } |
2208 | 2208 | ||