diff options
Diffstat (limited to 'src/util/server.c')
-rw-r--r-- | src/util/server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/util/server.c b/src/util/server.c index f604fbc50..8ffc9c027 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -223,7 +223,7 @@ struct GNUNET_SERVER_Client | |||
223 | 223 | ||
224 | /** | 224 | /** |
225 | * Current task identifier for the receive call | 225 | * Current task identifier for the receive call |
226 | * (or GNUNET_SCHEDULER_NO_PREREQUISITE_TASK for none). | 226 | * (or GNUNET_SCHEDULER_NO_TASK for none). |
227 | */ | 227 | */ |
228 | GNUNET_SCHEDULER_TaskIdentifier my_receive; | 228 | GNUNET_SCHEDULER_TaskIdentifier my_receive; |
229 | 229 | ||
@@ -351,7 +351,7 @@ process_listen_socket (void *cls, | |||
351 | GNUNET_SCHEDULER_add_select (server->sched, | 351 | GNUNET_SCHEDULER_add_select (server->sched, |
352 | GNUNET_YES, | 352 | GNUNET_YES, |
353 | GNUNET_SCHEDULER_PRIORITY_HIGH, | 353 | GNUNET_SCHEDULER_PRIORITY_HIGH, |
354 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 354 | GNUNET_SCHEDULER_NO_TASK, |
355 | GNUNET_TIME_UNIT_FOREVER_REL, | 355 | GNUNET_TIME_UNIT_FOREVER_REL, |
356 | GNUNET_MAX (server->listen_socket, | 356 | GNUNET_MAX (server->listen_socket, |
357 | server->shutpipe[0]) + 1, &r, NULL, | 357 | server->shutpipe[0]) + 1, &r, NULL, |
@@ -483,7 +483,7 @@ GNUNET_SERVER_create (struct GNUNET_SCHEDULER_Handle *sched, | |||
483 | GNUNET_SCHEDULER_add_select (sched, | 483 | GNUNET_SCHEDULER_add_select (sched, |
484 | GNUNET_YES, | 484 | GNUNET_YES, |
485 | GNUNET_SCHEDULER_PRIORITY_HIGH, | 485 | GNUNET_SCHEDULER_PRIORITY_HIGH, |
486 | GNUNET_SCHEDULER_NO_PREREQUISITE_TASK, | 486 | GNUNET_SCHEDULER_NO_TASK, |
487 | GNUNET_TIME_UNIT_FOREVER_REL, | 487 | GNUNET_TIME_UNIT_FOREVER_REL, |
488 | GNUNET_MAX (ret->listen_socket, | 488 | GNUNET_MAX (ret->listen_socket, |
489 | ret->shutpipe[0]) + 1, &r, | 489 | ret->shutpipe[0]) + 1, &r, |
@@ -621,7 +621,7 @@ shutdown_incoming_processing (struct GNUNET_SERVER_Client *client) | |||
621 | struct NotifyList *n; | 621 | struct NotifyList *n; |
622 | unsigned int rc; | 622 | unsigned int rc; |
623 | 623 | ||
624 | GNUNET_assert (client->my_receive == GNUNET_SCHEDULER_NO_PREREQUISITE_TASK); | 624 | GNUNET_assert (client->my_receive == GNUNET_SCHEDULER_NO_TASK); |
625 | rc = client->reference_count; | 625 | rc = client->reference_count; |
626 | if (client->server != NULL) | 626 | if (client->server != NULL) |
627 | { | 627 | { |
@@ -740,7 +740,7 @@ process_incoming (void *cls, | |||
740 | const char *cbuf = buf; | 740 | const char *cbuf = buf; |
741 | size_t maxcpy; | 741 | size_t maxcpy; |
742 | 742 | ||
743 | client->my_receive = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK; | 743 | client->my_receive = GNUNET_SCHEDULER_NO_TASK; |
744 | if ((buf == NULL) || | 744 | if ((buf == NULL) || |
745 | (available == 0) || | 745 | (available == 0) || |
746 | (errCode != 0) || | 746 | (errCode != 0) || |
@@ -1107,9 +1107,9 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client) | |||
1107 | { | 1107 | { |
1108 | if (client->server == NULL) | 1108 | if (client->server == NULL) |
1109 | return; /* already disconnected */ | 1109 | return; /* already disconnected */ |
1110 | GNUNET_assert (client->my_receive != GNUNET_SCHEDULER_NO_PREREQUISITE_TASK); | 1110 | GNUNET_assert (client->my_receive != GNUNET_SCHEDULER_NO_TASK); |
1111 | client->receive_cancel (client->client_closure, client->my_receive); | 1111 | client->receive_cancel (client->client_closure, client->my_receive); |
1112 | client->my_receive = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK; | 1112 | client->my_receive = GNUNET_SCHEDULER_NO_TASK; |
1113 | shutdown_incoming_processing (client); | 1113 | shutdown_incoming_processing (client); |
1114 | } | 1114 | } |
1115 | 1115 | ||