aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-12-18 15:19:37 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-12-18 15:19:37 +0000
commit4d80dc1d5536ad26d19c69d920dcffe84d93cf07 (patch)
tree93a32cb5576a707f1742dbd9263417ad76305eab /src
parentea34d2bd85d17841962d50177b1f35ae158ab3ec (diff)
downloadgnunet-4d80dc1d5536ad26d19c69d920dcffe84d93cf07.tar.gz
gnunet-4d80dc1d5536ad26d19c69d920dcffe84d93cf07.zip
tests and session timeout for bt
Diffstat (limited to 'src')
-rw-r--r--src/transport/Makefile.am2
-rw-r--r--src/transport/plugin_transport_bluetooth.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 2e49b0cf0..e6ecf4ffe 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -464,7 +464,9 @@ TESTS = \
464 $(HTTPS_API_TEST) \ 464 $(HTTPS_API_TEST) \
465 $(HTTPS_API_TIMEOUT_TEST) \ 465 $(HTTPS_API_TIMEOUT_TEST) \
466 $(WLAN_API_TEST) \ 466 $(WLAN_API_TEST) \
467 $(WLAN_TIMEOUT_TEST) \
467 $(BT_API_TEST) \ 468 $(BT_API_TEST) \
469 $(BT_TIMEOUT_TEST) \
468 test_transport_api_multi \ 470 test_transport_api_multi \
469 test_transport_blacklisting_no_bl \ 471 test_transport_blacklisting_no_bl \
470 test_transport_blacklisting_outbound_bl_full \ 472 test_transport_blacklisting_outbound_bl_full \
diff --git a/src/transport/plugin_transport_bluetooth.c b/src/transport/plugin_transport_bluetooth.c
index 621a880e1..51e8a89bd 100644
--- a/src/transport/plugin_transport_bluetooth.c
+++ b/src/transport/plugin_transport_bluetooth.c
@@ -1804,7 +1804,10 @@ bluetooth_plugin_update_session_timeout (void *cls,
1804 const struct GNUNET_PeerIdentity *peer, 1804 const struct GNUNET_PeerIdentity *peer,
1805 struct Session *session) 1805 struct Session *session)
1806{ 1806{
1807 1807 if (GNUNET_SCHEDULER_NO_TASK != session->timeout_task)
1808 GNUNET_SCHEDULER_cancel (session->timeout_task);
1809 session->timeout_task = GNUNET_SCHEDULER_add_delayed (
1810 GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, &session_timeout, session);
1808} 1811}
1809 1812
1810 1813