aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-02-03 14:11:03 +0000
committerChristian Grothoff <christian@grothoff.org>2015-02-03 14:11:03 +0000
commitb2e99dd91c01b5fcc16b3b1031df897aeec05eef (patch)
tree31caea8a19fd943f8a9f7f7f3c19e52e11d95a77 /src/transport/gnunet-service-transport.c
parent55cecdea8638fa23c68e7ade7a8d5629da658f9e (diff)
downloadgnunet-b2e99dd91c01b5fcc16b3b1031df897aeec05eef.tar.gz
gnunet-b2e99dd91c01b5fcc16b3b1031df897aeec05eef.zip
separate ATS connectivity suggestions from ATS scheduling API
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r--src/transport/gnunet-service-transport.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 2f0a17360..e65af664c 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -122,11 +122,16 @@ static struct GNUNET_SERVER_Handle *GST_server;
122struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key; 122struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key;
123 123
124/** 124/**
125 * ATS handle. 125 * ATS scheduling handle.
126 */ 126 */
127struct GNUNET_ATS_SchedulingHandle *GST_ats; 127struct GNUNET_ATS_SchedulingHandle *GST_ats;
128 128
129/** 129/**
130 * ATS connectivity handle.
131 */
132struct GNUNET_ATS_ConnectivityHandle *GST_ats_connect;
133
134/**
130 * Hello address expiration 135 * Hello address expiration
131 */ 136 */
132struct GNUNET_TIME_Relative hello_expiration; 137struct GNUNET_TIME_Relative hello_expiration;
@@ -857,6 +862,8 @@ shutdown_task (void *cls,
857 GST_ats_done (); 862 GST_ats_done ();
858 GNUNET_ATS_scheduling_done (GST_ats); 863 GNUNET_ATS_scheduling_done (GST_ats);
859 GST_ats = NULL; 864 GST_ats = NULL;
865 GNUNET_ATS_connectivity_done (GST_ats_connect);
866 GST_ats_connect = NULL;
860 GST_clients_stop (); 867 GST_clients_stop ();
861 GST_blacklist_stop (); 868 GST_blacklist_stop ();
862 GST_hello_stop (); 869 GST_hello_stop ();
@@ -986,6 +993,7 @@ run (void *cls,
986 GST_hello_start (friend_only, &process_hello_update, NULL ); 993 GST_hello_start (friend_only, &process_hello_update, NULL );
987 GNUNET_assert(NULL != GST_hello_get()); 994 GNUNET_assert(NULL != GST_hello_get());
988 GST_blacklist_start (GST_server, GST_cfg, &GST_my_identity); 995 GST_blacklist_start (GST_server, GST_cfg, &GST_my_identity);
996 GST_ats_connect = GNUNET_ATS_connectivity_init (GST_cfg);
989 GST_ats = GNUNET_ATS_scheduling_init (GST_cfg, 997 GST_ats = GNUNET_ATS_scheduling_init (GST_cfg,
990 &ats_request_address_change, 998 &ats_request_address_change,
991 NULL); 999 NULL);