diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-02 14:39:13 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-02 14:39:13 +0000 |
commit | e08a8d18dc0b1a1dbe89485a59791cfe513d22d0 (patch) | |
tree | 3163dd75399551b4c4055c485df4da30e2de0812 /src/util/server.c | |
parent | d57a55d4d59b2e72ce8ce499a835f78c5a1afa86 (diff) | |
download | gnunet-e08a8d18dc0b1a1dbe89485a59791cfe513d22d0.tar.gz gnunet-e08a8d18dc0b1a1dbe89485a59791cfe513d22d0.zip |
LRN: Update plibc and utf8ization
Diffstat (limited to 'src/util/server.c')
-rw-r--r-- | src/util/server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util/server.c b/src/util/server.c index d639f65b5..e25ada304 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -819,7 +819,7 @@ warn_no_receive_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
819 | 819 | ||
820 | GNUNET_break (0 != client->warn_type); /* type should never be 0 here, as we don't use 0 */ | 820 | GNUNET_break (0 != client->warn_type); /* type should never be 0 here, as we don't use 0 */ |
821 | client->warn_task = | 821 | client->warn_task = |
822 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, | 822 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
823 | &warn_no_receive_done, client); | 823 | &warn_no_receive_done, client); |
824 | if (0 == (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 824 | if (0 == (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
825 | LOG (GNUNET_ERROR_TYPE_WARNING, | 825 | LOG (GNUNET_ERROR_TYPE_WARNING, |
@@ -907,7 +907,7 @@ GNUNET_SERVER_inject (struct GNUNET_SERVER_Handle *server, | |||
907 | GNUNET_break (0 != type); /* type should never be 0 here, as we don't use 0 */ | 907 | GNUNET_break (0 != type); /* type should never be 0 here, as we don't use 0 */ |
908 | sender->warn_start = GNUNET_TIME_absolute_get (); | 908 | sender->warn_start = GNUNET_TIME_absolute_get (); |
909 | sender->warn_task = | 909 | sender->warn_task = |
910 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, | 910 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
911 | &warn_no_receive_done, sender); | 911 | &warn_no_receive_done, sender); |
912 | sender->warn_type = type; | 912 | sender->warn_type = type; |
913 | } | 913 | } |
@@ -1389,6 +1389,7 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client) | |||
1389 | (void) GNUNET_SCHEDULER_add_now (&destroy_connection, | 1389 | (void) GNUNET_SCHEDULER_add_now (&destroy_connection, |
1390 | client->connection); | 1390 | client->connection); |
1391 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == client->warn_task); | 1391 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == client->warn_task); |
1392 | GNUNET_assert (GNUNET_NO == client->receive_pending); | ||
1392 | GNUNET_free (client); | 1393 | GNUNET_free (client); |
1393 | /* we might be in soft-shutdown, test if we're done */ | 1394 | /* we might be in soft-shutdown, test if we're done */ |
1394 | if (NULL != server) | 1395 | if (NULL != server) |