return true;
}
-static void complete_server(struct tevent_context *ev,
+static bool complete_server(struct tevent_context *ev,
struct oserver *oserver, const char *dumpfile)
{
/* Re-set this even if restored from file, in case it changed. */
/* Show talloc tree on SIGUSR1. */
tevent_add_signal(ev, oserver, SIGUSR1, SA_RESTART,
talloc_dump, oserver);
+
+ oserver->fde = tevent_add_fd(ev, oserver, oserver->fd,
+ TEVENT_FD_READ, add_client, oserver);
+ if (!oserver->fde)
+ return false;
+ return true;
}
struct oserver *oserver_restore(struct tevent_context *ev, const char *dumpfile)
{
+ unsigned int i;
struct oserver *oserver = talloc(ev, struct oserver);
if (!load_file(oserver, dumpfile)) {
talloc_free(oserver);
return NULL;
}
- complete_server(ev, oserver, dumpfile);
+
+ /* Restore ignored fields in clients (fde and oserver). */
+ for (i = 0; i < ARRAY_SIZE(oserver->clients); i++) {
+ struct client *client = oserver->clients[i];
+ if (!client)
+ continue;
+ client->oserver = oserver;
+ client->fde = tevent_add_fd(ev, client, client->fd,
+ state_flag_map[client->state],
+ service_client, client);
+ tevent_fd_set_auto_close(client->fde);
+ }
+
+ if (!complete_server(ev, oserver, dumpfile)) {
+ talloc_free(oserver);
+ return NULL;
+ }
return oserver;
}
return NULL;
}
- oserver->fde = tevent_add_fd(ev, oserver, oserver->fd,
- TEVENT_FD_READ, add_client, oserver);
- if (!oserver->fde) {
+ if (!complete_server(ev, oserver, dumpfile)) {
talloc_free(oserver);
return NULL;
}
- complete_server(ev, oserver, dumpfile);
return oserver;
}