diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-05-09 16:05:25 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-05-09 16:05:25 +0000 |
commit | 36aa5926be1dbe6db912d021b57cf436e3b9756a (patch) | |
tree | 44b9f2dbc62ac75388969d4a72b86bc84613a00e /src/ats | |
parent | b07c793a4fc0475d174800fc1fbf2c02490936ca (diff) | |
download | gnunet-36aa5926be1dbe6db912d021b57cf436e3b9756a.tar.gz gnunet-36aa5926be1dbe6db912d021b57cf436e3b9756a.zip |
- fixes
Diffstat (limited to 'src/ats')
-rw-r--r-- | src/ats/gnunet-service-ats.c | 2 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_scheduling.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c index e8cde18b6..2f1dc95e8 100644 --- a/src/ats/gnunet-service-ats.c +++ b/src/ats/gnunet-service-ats.c | |||
@@ -57,7 +57,6 @@ handle_ats_start (void *cls, struct GNUNET_SERVER_Client *client, | |||
57 | const struct ClientStartMessage *msg = | 57 | const struct ClientStartMessage *msg = |
58 | (const struct ClientStartMessage *) message; | 58 | (const struct ClientStartMessage *) message; |
59 | enum StartFlag flag; | 59 | enum StartFlag flag; |
60 | |||
61 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ATS_START"); | 60 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ATS_START"); |
62 | flag = ntohl (msg->start_flag); | 61 | flag = ntohl (msg->start_flag); |
63 | switch (flag) | 62 | switch (flag) |
@@ -114,6 +113,7 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
114 | GAS_scheduling_done (); | 113 | GAS_scheduling_done (); |
115 | GAS_performance_done (); | 114 | GAS_performance_done (); |
116 | GAS_reservations_done (); | 115 | GAS_reservations_done (); |
116 | GNUNET_SERVER_disconnect_notify_cancel (GSA_server, &client_disconnect_handler, NULL); | ||
117 | if (NULL != GSA_stats) | 117 | if (NULL != GSA_stats) |
118 | { | 118 | { |
119 | GNUNET_STATISTICS_destroy (GSA_stats, GNUNET_NO); | 119 | GNUNET_STATISTICS_destroy (GSA_stats, GNUNET_NO); |
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 563c8f43c..5d03ff007 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c | |||
@@ -59,7 +59,6 @@ GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client) | |||
59 | } | 59 | } |
60 | my_client = client; | 60 | my_client = client; |
61 | GNUNET_SERVER_notification_context_add (nc, client); | 61 | GNUNET_SERVER_notification_context_add (nc, client); |
62 | GNUNET_SERVER_client_keep (client); | ||
63 | return GNUNET_OK; | 62 | return GNUNET_OK; |
64 | } | 63 | } |
65 | 64 | ||
@@ -76,7 +75,6 @@ GAS_scheduling_remove_client (struct GNUNET_SERVER_Client *client) | |||
76 | if (my_client != client) | 75 | if (my_client != client) |
77 | return; | 76 | return; |
78 | GAS_addresses_destroy_all (); | 77 | GAS_addresses_destroy_all (); |
79 | GNUNET_SERVER_client_drop (client); | ||
80 | my_client = NULL; | 78 | my_client = NULL; |
81 | } | 79 | } |
82 | 80 | ||
@@ -413,8 +411,13 @@ GAS_scheduling_init (struct GNUNET_SERVER_Handle *server) | |||
413 | void | 411 | void |
414 | GAS_scheduling_done () | 412 | GAS_scheduling_done () |
415 | { | 413 | { |
414 | if (NULL != my_client) | ||
415 | { | ||
416 | my_client = NULL; | ||
417 | } | ||
416 | GNUNET_SERVER_notification_context_destroy (nc); | 418 | GNUNET_SERVER_notification_context_destroy (nc); |
417 | nc = NULL; | 419 | nc = NULL; |
420 | |||
418 | } | 421 | } |
419 | 422 | ||
420 | 423 | ||