lca2011: oserver_restore to restore fields we labelled CDUMP_IGNORE.

[ccan-lca-2011.git] / ccan / oserver / oserver.c

diff --git a/ccan/oserver/oserver.c b/ccan/oserver/oserver.c
index b65fe6b1f3069fd90dae4cda0895210bda37a649..50b49bd5f94746c8259fb3c609c285c5d68684c9 100644 (file)
--- a/ccan/oserver/oserver.c
+++ b/ccan/oserver/oserver.c
@@ -326,7 +326,7 @@ static bool load_file(struct oserver *oserver, const char *file)
        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. */
@@ -341,16 +341,39 @@ static void complete_server(struct tevent_context *ev,
        /* 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;
 }
 
@@ -391,13 +414,10 @@ struct oserver *oserver_setup(struct tevent_context *ev, unsigned short port,
                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;
 }