aboutsummaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_unix.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-06-29 09:26:40 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-06-29 09:26:40 +0000
commit2265f50f2fa412d412fe239f44c0264b99d494d6 (patch)
tree4abf177ae7d3d006329da61cbc98d4553631c436 /src/transport/plugin_transport_unix.c
parent65bd2954fccfb94b0ccc91eba559d73c2852f803 (diff)
downloadgnunet-2265f50f2fa412d412fe239f44c0264b99d494d6.tar.gz
gnunet-2265f50f2fa412d412fe239f44c0264b99d494d6.zip
- fixed session code
Diffstat (limited to 'src/transport/plugin_transport_unix.c')
-rw-r--r--src/transport/plugin_transport_unix.c36
1 files changed, 15 insertions, 21 deletions
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index b7e10b720..2735d7acc 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -1238,15 +1238,14 @@ session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1238 struct Session *s = cls; 1238 struct Session *s = cls;
1239 1239
1240 s->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1240 s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
1241 1241 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1242 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p was idle for %llu, disconnecting\n", 1242 "Session %p was idle for %llu ms, disconnecting\n",
1243 s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); 1243 s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
1244
1245 /* call session destroy function */ 1244 /* call session destroy function */
1246 disconnect_session(s); 1245 disconnect_session(s);
1247
1248} 1246}
1249 1247
1248
1250/** 1249/**
1251 * Start session timeout 1250 * Start session timeout
1252 */ 1251 */
@@ -1255,15 +1254,15 @@ start_session_timeout (struct Session *s)
1255{ 1254{
1256 GNUNET_assert (NULL != s); 1255 GNUNET_assert (NULL != s);
1257 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); 1256 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
1258
1259 s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 1257 s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
1260 &session_timeout, 1258 &session_timeout,
1261 s); 1259 s);
1262 1260 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1263 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p set to %llu\n", 1261 "Timeout for session %p set to %llu ms\n",
1264 s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); 1262 s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
1265} 1263}
1266 1264
1265
1267/** 1266/**
1268 * Increment session timeout due to activity 1267 * Increment session timeout due to activity
1269 */ 1268 */
@@ -1277,11 +1276,12 @@ reschedule_session_timeout (struct Session *s)
1277 s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, 1276 s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
1278 &session_timeout, 1277 &session_timeout,
1279 s); 1278 s);
1280 1279 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1281 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n", 1280 "Timeout rescheduled for session %p set to %llu ms\n",
1282 s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); 1281 s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
1283} 1282}
1284 1283
1284
1285/** 1285/**
1286 * Cancel timeout 1286 * Cancel timeout
1287 */ 1287 */
@@ -1294,18 +1294,12 @@ stop_session_timeout (struct Session *s)
1294 { 1294 {
1295 GNUNET_SCHEDULER_cancel (s->timeout_task); 1295 GNUNET_SCHEDULER_cancel (s->timeout_task);
1296 s->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1296 s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
1297 1297 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1298 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p canceled\n", 1298 "Timeout stopped for session %p canceled\n",
1299 s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); 1299 s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
1300 }
1301 else
1302 {
1303 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p was not active\n",
1304 s);
1305 } 1300 }
1306} 1301}
1307 1302
1308
1309/** 1303/**
1310 * The exported method. Makes the core api available via a global and 1304 * The exported method. Makes the core api available via a global and
1311 * returns the unix transport API. 1305 * returns the unix transport API.