[GNUnet-SVN] r31538 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2013-12-18 16:19:37 +0100 (Wed, 18 Dec 2013)
New Revision: 31538

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/plugin_transport_bluetooth.c
Log:
tests and session timeout for bt


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2013-12-18 15:09:43 UTC (rev 31537)
+++ gnunet/src/transport/Makefile.am    2013-12-18 15:19:37 UTC (rev 31538)
@@ -464,7 +464,9 @@
  $(HTTPS_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
  $(WLAN_API_TEST) \
+ $(WLAN_TIMEOUT_TEST) \
  $(BT_API_TEST) \
+ $(BT_TIMEOUT_TEST) \
  test_transport_api_multi \
  test_transport_blacklisting_no_bl \
  test_transport_blacklisting_outbound_bl_full \

Modified: gnunet/src/transport/plugin_transport_bluetooth.c
===================================================================
--- gnunet/src/transport/plugin_transport_bluetooth.c   2013-12-18 15:09:43 UTC 
(rev 31537)
+++ gnunet/src/transport/plugin_transport_bluetooth.c   2013-12-18 15:19:37 UTC 
(rev 31538)
@@ -1804,7 +1804,10 @@
                                   const struct GNUNET_PeerIdentity *peer,
                                   struct Session *session)
 {
-
+  if (GNUNET_SCHEDULER_NO_TASK != session->timeout_task)
+    GNUNET_SCHEDULER_cancel (session->timeout_task);
+  session->timeout_task = GNUNET_SCHEDULER_add_delayed (
+      GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, &session_timeout, session);
 }