struct client *c = me->oserver->clients[i];
if (!c || c == me)
continue;
- if (c->oracle == NULL && input_finished(c->question)) {
- me->subclient = c;
- c->oracle = me;
+ if (c->oracle == -1 && input_finished(c->question)) {
+ me->subclient = c->id;
+ c->oracle = me->id;
return true;
}
}
struct client *c = me->oserver->clients[i];
if (!c || c == me)
continue;
- if (c->subclient == NULL && input_finished(c->question)) {
- me->oracle = c;
- c->subclient = me;
+ if (c->subclient == -1 && input_finished(c->question)) {
+ me->oracle = c->id;
+ c->subclient = me->id;
return true;
}
}
set_state(c, SENDING_OTHER_QUESTION_PREFIX);
break;
case SENDING_OTHER_QUESTION_PREFIX:
- if (!c->subclient)
+ if (c->subclient == -1)
goto need_subclient;
if (!send_string(c, "While the Oracle ponders,"
" please answer the following question:\n"))
goto fail;
break;
case SENDING_OTHER_QUESTION:
- if (!c->subclient)
+ if (c->subclient == -1)
goto need_subclient;
- if (!send_string(c, c->subclient->question))
+ if (!send_string(c,
+ c->oserver->clients[c->subclient]->question))
goto fail;
break;
case RECEIVING_OTHER_ANSWER:
- if (!c->subclient)
+ if (c->subclient == -1)
goto need_subclient;
- len = read_string(c->fd, &c->subclient->answer);
+ len = read_string(c->fd,
+ &c->oserver->clients[c->subclient]->answer);
if (len <= 0)
goto fail;
- if (input_finished(c->subclient->answer)) {
+ if (input_finished(c->oserver->clients[c->subclient]->answer)) {
set_state(c, SENDING_ANSWER_PREFIX);
- wakeup(c->subclient);
+ wakeup(c->oserver->clients[c->subclient]);
}
break;
case SENDING_ANSWER_PREFIX:
tevent_fd_set_flags(c->fde, 0);
} else
/* In case they are waiting... */
- wakeup(c->subclient);
+ wakeup(c->oserver->clients[c->subclient]);
return;
need_answer:
/* If we don't have an oracle and find one, that's OK. */
- if (!c->oracle && get_oracle(c)) {
+ if (c->oracle == -1 && get_oracle(c)) {
/* In case they are waiting... */
- wakeup(c->oracle);
+ wakeup(c->oserver->clients[c->oracle]);
return;
}
static int cleanup_client(struct client *client)
{
- unsigned int i;
/* We were an oracle? */
- if (client->subclient)
- client->subclient->oracle = NULL;
+ if (client->subclient >= 0)
+ client->oserver->clients[client->subclient]->oracle = -1;
/* We had an oracle? */
- if (client->oracle)
- client->oracle->subclient = NULL;
-
- for (i = 0; i < ARRAY_SIZE(client->oserver->clients); i++) {
- if (client->oserver->clients[i] == client) {
- client->oserver->clients[i] = NULL;
- tevent_fd_set_flags(client->oserver->fde,
- TEVENT_FD_READ);
- return 0;
- }
- }
- abort();
+ if (client->oracle >= 0)
+ client->oserver->clients[client->oracle]->subclient = -1;
+
+ assert(client->oserver->clients[client->id] == client);
+ client->oserver->clients[client->id] = NULL;
+ return 0;
}
static void add_client(struct tevent_context *ev,
{
struct oserver *oserver = _oserver;
struct client *client;
- unsigned int i;
client = talloc(oserver, struct client);
client->fd = accept(oserver->fd, NULL, 0);
client->bytes_sent = 0;
client->question = talloc_strdup(client, "");
client->oserver = oserver;
- client->oracle = NULL;
- client->subclient = NULL;
+ client->oracle = -1;
+ client->subclient = -1;
client->answer = talloc_strdup(client, "");
client->fde = tevent_add_fd(ev, client, client->fd,
state_flag_map[client->state],
tevent_fd_set_auto_close(client->fde);
/* Find empty slot in array for this client. */
- for (i = 0; oserver->clients[i]; i++);
- oserver->clients[i] = client;
+ for (client->id = 0; oserver->clients[client->id]; client->id++);
+ oserver->clients[client->id] = client;
talloc_set_destructor(client, cleanup_client);
/* Full? Stop listening... */
- if (i == ARRAY_SIZE(oserver->clients)-1)
+ if (client->id == ARRAY_SIZE(oserver->clients)-1)
tevent_fd_set_flags(oserver->fde, 0);
}