[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21610 - in gnunet/src: namestore transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21610 - in gnunet/src: namestore transport |
Date: |
Mon, 28 May 2012 00:05:16 +0200 |
Author: grothoff
Date: 2012-05-28 00:05:16 +0200 (Mon, 28 May 2012)
New Revision: 21610
Modified:
gnunet/src/namestore/test_namestore_api_lookup.c
gnunet/src/transport/plugin_transport_tcp.c
Log:
-minor code cleanups
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2012-05-27 21:47:13 UTC
(rev 21609)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2012-05-27 22:05:16 UTC
(rev 21610)
@@ -286,11 +286,9 @@
GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
GNUNET_TIME_UNIT_FOREVER_ABS,
RECORDS, s_rd, s_signature, put_cont, s_name);
-
-
-
}
+
static int
check ()
{
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2012-05-27 21:47:13 UTC (rev
21609)
+++ gnunet/src/transport/plugin_transport_tcp.c 2012-05-27 22:05:16 UTC (rev
21610)
@@ -2132,15 +2132,14 @@
struct Session *s = cls;
s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p was idle for %llu,
disconnecting\n",
- s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p was idle for %llu, disconnecting\n",
+ s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
/* call session destroy function */
disconnect_session(s);
-
}
+
/**
* Start session timeout
*/
@@ -2149,15 +2148,16 @@
{
GNUNET_assert (NULL != s);
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
-
s->timeout_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&session_timeout,
s);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p set to %llu\n",
- s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout for session %p set to %llu\n",
+ s,
+ GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
}
+
/**
* Increment session timeout due to activity
*/
@@ -2167,22 +2167,22 @@
GNUNET_assert (NULL != s);
if (GNUNET_SCHEDULER_NO_TASK == s->timeout_task)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout for peer `%s' %s not
scheduled\n",
- GNUNET_i2s (&s->target), tcp_address_to_string(NULL, s->addr,
s->addrlen));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout for peer `%s' %s not scheduled\n",
+ GNUNET_i2s (&s->target),
+ tcp_address_to_string(NULL, s->addr, s->addrlen));
return;
}
-
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
-
GNUNET_SCHEDULER_cancel (s->timeout_task);
s->timeout_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&session_timeout,
s);
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p set
to %llu\n",
- s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ s,
+ (unsigned long long)
GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
}
+
/**
* Cancel timeout
*/
@@ -2190,19 +2190,19 @@
stop_session_timeout (struct Session *s)
{
GNUNET_assert (NULL != s);
-
if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
{
GNUNET_SCHEDULER_cancel (s->timeout_task);
s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout rescheduled for session %p
canceled\n",
- s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout rescheduled for session %p canceled\n",
+ s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout for session %p was not
active\n",
- s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout for session %p was not active\n",
+ s);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21610 - in gnunet/src: namestore transport,
gnunet <=