diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-29 09:26:40 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-29 09:26:40 +0000 |
commit | 2265f50f2fa412d412fe239f44c0264b99d494d6 (patch) | |
tree | 4abf177ae7d3d006329da61cbc98d4553631c436 | |
parent | 65bd2954fccfb94b0ccc91eba559d73c2852f803 (diff) | |
download | gnunet-2265f50f2fa412d412fe239f44c0264b99d494d6.tar.gz gnunet-2265f50f2fa412d412fe239f44c0264b99d494d6.zip |
- fixed session code
-rw-r--r-- | src/transport/plugin_transport_http.c | 82 | ||||
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 42 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 39 | ||||
-rw-r--r-- | src/transport/plugin_transport_unix.c | 36 |
4 files changed, 85 insertions, 114 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index d99f531b7..7d13960f0 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -1495,80 +1495,72 @@ session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1495 | struct Session *s = cls; | 1495 | struct Session *s = cls; |
1496 | 1496 | ||
1497 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 1497 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
1498 | 1498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
1499 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p was idle for %llu, disconnecting\n", | 1499 | "Session %p was idle for %llu ms, disconnecting\n", |
1500 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 1500 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
1501 | 1501 | ||
1502 | /* call session destroy function */ | 1502 | /* call session destroy function */ |
1503 | if (s->inbound == GNUNET_NO) | 1503 | if (s->inbound == GNUNET_NO) |
1504 | GNUNET_assert (GNUNET_OK == client_disconnect (s)); | 1504 | GNUNET_assert (GNUNET_OK == client_disconnect (s)); |
1505 | else | 1505 | else |
1506 | GNUNET_assert (GNUNET_OK == server_disconnect (s)); | 1506 | GNUNET_assert (GNUNET_OK == server_disconnect (s)); |
1507 | |||
1508 | } | 1507 | } |
1509 | 1508 | ||
1510 | 1509 | ||
1511 | /** | 1510 | /** |
1512 | * Start session timeout | 1511 | * Start session timeout |
1513 | */ | 1512 | */ |
1514 | static void | 1513 | static void |
1515 | start_session_timeout (struct Session *s) | 1514 | start_session_timeout (struct Session *s) |
1516 | { | 1515 | { |
1517 | GNUNET_assert (NULL != s); | 1516 | GNUNET_assert (NULL != s); |
1518 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); | 1517 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); |
1519 | 1518 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | |
1520 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 1519 | &session_timeout, |
1521 | &session_timeout, | 1520 | s); |
1522 | s); | 1521 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1523 | 1522 | "Timeout for session %p set to %llu ms\n", | |
1524 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p set to %llu\n", | 1523 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
1525 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | ||
1526 | } | 1524 | } |
1527 | 1525 | ||
1528 | 1526 | ||
1529 | /** | 1527 | /** |
1530 | * Increment session timeout due to activity | 1528 | * Increment session timeout due to activity |
1531 | */ | 1529 | */ |
1532 | static void | 1530 | static void |
1533 | reschedule_session_timeout (struct Session *s) | 1531 | reschedule_session_timeout (struct Session *s) |
1534 | { | 1532 | { |
1535 | GNUNET_assert (NULL != s); | 1533 | GNUNET_assert (NULL != s); |
1536 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task); | 1534 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task); |
1537 | 1535 | ||
1538 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 1536 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
1539 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 1537 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
1540 | &session_timeout, | 1538 | &session_timeout, |
1541 | s); | 1539 | s); |
1542 | 1540 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
1543 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n", | 1541 | "Timeout rescheduled for session %p set to %llu ms\n", |
1544 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 1542 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
1545 | } | 1543 | } |
1546 | 1544 | ||
1547 | 1545 | ||
1548 | /** | 1546 | /** |
1549 | * Cancel timeout | 1547 | * Cancel timeout |
1550 | */ | 1548 | */ |
1551 | static void | 1549 | static void |
1552 | stop_session_timeout (struct Session *s) | 1550 | stop_session_timeout (struct Session *s) |
1553 | { | 1551 | { |
1554 | GNUNET_assert (NULL != s); | 1552 | GNUNET_assert (NULL != s); |
1555 | 1553 | ||
1556 | if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) | 1554 | if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) |
1557 | { | 1555 | { |
1558 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 1556 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
1559 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 1557 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
1560 | 1558 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
1561 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p canceled\n", | 1559 | "Timeout stopped for session %p canceled\n", |
1562 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 1560 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
1563 | } | 1561 | } |
1564 | else | ||
1565 | { | ||
1566 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p was not active\n", | ||
1567 | s); | ||
1568 | } | ||
1569 | } | 1562 | } |
1570 | 1563 | ||
1571 | |||
1572 | /** | 1564 | /** |
1573 | * Entry point for the plugin. | 1565 | * Entry point for the plugin. |
1574 | */ | 1566 | */ |
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 007e87f93..e5b821978 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -1706,7 +1706,7 @@ handle_tcp_nat_probe (void *cls, struct GNUNET_SERVER_Client *client, | |||
1706 | const struct sockaddr_in *s4; | 1706 | const struct sockaddr_in *s4; |
1707 | const struct sockaddr_in6 *s6; | 1707 | const struct sockaddr_in6 *s6; |
1708 | 1708 | ||
1709 | LOG (GNUNET_ERROR_TYPE_DEBUG, "received NAT probe\n"); | 1709 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Received NAT probe\n"); |
1710 | 1710 | ||
1711 | /* We have received a TCP NAT probe, meaning we (hopefully) initiated | 1711 | /* We have received a TCP NAT probe, meaning we (hopefully) initiated |
1712 | * a connection to this peer by running gnunet-nat-client. This peer | 1712 | * a connection to this peer by running gnunet-nat-client. This peer |
@@ -2188,8 +2188,8 @@ session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
2188 | 2188 | ||
2189 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 2189 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
2190 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2190 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2191 | "Session %p was idle for %llu, disconnecting\n", | 2191 | "Session %p was idle for %llu ms, disconnecting\n", |
2192 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2192 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2193 | /* call session destroy function */ | 2193 | /* call session destroy function */ |
2194 | disconnect_session(s); | 2194 | disconnect_session(s); |
2195 | } | 2195 | } |
@@ -2206,10 +2206,9 @@ start_session_timeout (struct Session *s) | |||
2206 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2206 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2207 | &session_timeout, | 2207 | &session_timeout, |
2208 | s); | 2208 | s); |
2209 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2209 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2210 | "Timeout for session %p set to %llu\n", | 2210 | "Timeout for session %p set to %llu ms\n", |
2211 | s, | 2211 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2212 | GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | ||
2213 | } | 2212 | } |
2214 | 2213 | ||
2215 | 2214 | ||
@@ -2220,21 +2219,15 @@ static void | |||
2220 | reschedule_session_timeout (struct Session *s) | 2219 | reschedule_session_timeout (struct Session *s) |
2221 | { | 2220 | { |
2222 | GNUNET_assert (NULL != s); | 2221 | GNUNET_assert (NULL != s); |
2223 | if (GNUNET_SCHEDULER_NO_TASK == s->timeout_task) | 2222 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task); |
2224 | { | 2223 | |
2225 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
2226 | "Timeout for peer `%s' %s not scheduled\n", | ||
2227 | GNUNET_i2s (&s->target), | ||
2228 | tcp_address_to_string(NULL, s->addr, s->addrlen)); | ||
2229 | return; | ||
2230 | } | ||
2231 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 2224 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
2232 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2225 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2233 | &session_timeout, | 2226 | &session_timeout, |
2234 | s); | 2227 | s); |
2235 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n", | 2228 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2236 | s, | 2229 | "Timeout rescheduled for session %p set to %llu ms\n", |
2237 | (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2230 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2238 | } | 2231 | } |
2239 | 2232 | ||
2240 | 2233 | ||
@@ -2245,19 +2238,14 @@ static void | |||
2245 | stop_session_timeout (struct Session *s) | 2238 | stop_session_timeout (struct Session *s) |
2246 | { | 2239 | { |
2247 | GNUNET_assert (NULL != s); | 2240 | GNUNET_assert (NULL != s); |
2241 | |||
2248 | if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) | 2242 | if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) |
2249 | { | 2243 | { |
2250 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 2244 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
2251 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 2245 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
2252 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2246 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2253 | "Timeout rescheduled for session %p canceled\n", | 2247 | "Timeout stopped for session %p canceled\n", |
2254 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2248 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2255 | } | ||
2256 | else | ||
2257 | { | ||
2258 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2259 | "Timeout for session %p was not active\n", | ||
2260 | s); | ||
2261 | } | 2249 | } |
2262 | } | 2250 | } |
2263 | 2251 | ||
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 5773614d7..5a1257845 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -704,7 +704,7 @@ disconnect_session (struct Session *s) | |||
704 | s, | 704 | s, |
705 | GNUNET_i2s (&s->target), | 705 | GNUNET_i2s (&s->target), |
706 | GNUNET_a2s (s->sock_addr, s->addrlen)); | 706 | GNUNET_a2s (s->sock_addr, s->addrlen)); |
707 | stop_session_timeout(s); | 707 | stop_session_timeout (s); |
708 | next = plugin->ipv4_queue_head; | 708 | next = plugin->ipv4_queue_head; |
709 | while (NULL != (udpw = next)) | 709 | while (NULL != (udpw = next)) |
710 | { | 710 | { |
@@ -2192,15 +2192,14 @@ session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
2192 | struct Session *s = cls; | 2192 | struct Session *s = cls; |
2193 | 2193 | ||
2194 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 2194 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
2195 | 2195 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2196 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p was idle for %llu, disconnecting\n", | 2196 | "Session %p was idle for %llu ms, disconnecting\n", |
2197 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2197 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2198 | |||
2199 | /* call session destroy function */ | 2198 | /* call session destroy function */ |
2200 | disconnect_session(s); | 2199 | disconnect_session(s); |
2201 | |||
2202 | } | 2200 | } |
2203 | 2201 | ||
2202 | |||
2204 | /** | 2203 | /** |
2205 | * Start session timeout | 2204 | * Start session timeout |
2206 | */ | 2205 | */ |
@@ -2209,15 +2208,15 @@ start_session_timeout (struct Session *s) | |||
2209 | { | 2208 | { |
2210 | GNUNET_assert (NULL != s); | 2209 | GNUNET_assert (NULL != s); |
2211 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); | 2210 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); |
2212 | |||
2213 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2211 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2214 | &session_timeout, | 2212 | &session_timeout, |
2215 | s); | 2213 | s); |
2216 | 2214 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2217 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p set to %llu\n", | 2215 | "Timeout for session %p set to %llu ms\n", |
2218 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2216 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2219 | } | 2217 | } |
2220 | 2218 | ||
2219 | |||
2221 | /** | 2220 | /** |
2222 | * Increment session timeout due to activity | 2221 | * Increment session timeout due to activity |
2223 | */ | 2222 | */ |
@@ -2231,11 +2230,12 @@ reschedule_session_timeout (struct Session *s) | |||
2231 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2230 | s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2232 | &session_timeout, | 2231 | &session_timeout, |
2233 | s); | 2232 | s); |
2234 | 2233 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2235 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set to %llu\n", | 2234 | "Timeout rescheduled for session %p set to %llu ms\n", |
2236 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2235 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2237 | } | 2236 | } |
2238 | 2237 | ||
2238 | |||
2239 | /** | 2239 | /** |
2240 | * Cancel timeout | 2240 | * Cancel timeout |
2241 | */ | 2241 | */ |
@@ -2248,17 +2248,14 @@ stop_session_timeout (struct Session *s) | |||
2248 | { | 2248 | { |
2249 | GNUNET_SCHEDULER_cancel (s->timeout_task); | 2249 | GNUNET_SCHEDULER_cancel (s->timeout_task); |
2250 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 2250 | s->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
2251 | 2251 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
2252 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p canceled\n", | 2252 | "Timeout stopped for session %p canceled\n", |
2253 | s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | 2253 | s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
2254 | } | ||
2255 | else | ||
2256 | { | ||
2257 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p was not active\n", | ||
2258 | s); | ||
2259 | } | 2254 | } |
2260 | } | 2255 | } |
2261 | 2256 | ||
2257 | |||
2258 | |||
2262 | /** | 2259 | /** |
2263 | * The exported method. Makes the core api available via a global and | 2260 | * The exported method. Makes the core api available via a global and |
2264 | * returns the udp transport API. | 2261 | * returns the udp transport API. |
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. |