X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=a3087b3335d423fa1e01fc25ab6bfe705a23933f;hp=5f6f4d5190422aa257db6f2f7cbbce6cf887e654;hb=03fe06fa71f065e918c46a65e6a45e76063a07eb;hpb=9f0f86150e9bf14760e155768dcb7df682257327 diff --git a/discover/discover-server.c b/discover/discover-server.c index 5f6f4d5..a3087b3 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -28,6 +28,7 @@ struct discover_server { struct waitset *waitset; struct waiter *waiter; struct list clients; + struct list status; struct device_handler *device_handler; }; @@ -157,7 +158,7 @@ static int write_device_remove_message(struct discover_server *server, } static int write_boot_status_message(struct discover_server *server, - struct client *client, const struct boot_status *status) + struct client *client, const struct status *status) { struct pb_protocol_message *message; int len; @@ -282,6 +283,7 @@ static int discover_server_process_message(void *arg) static int discover_server_process_connection(void *arg) { struct discover_server *server = arg; + struct statuslog_entry *entry; int fd, rc, i, n_devices; struct client *client; @@ -333,6 +335,10 @@ static int discover_server_process_connection(void *arg) } } + /* send status backlog to client */ + list_for_each_entry(&server->status, entry, list) + write_boot_status_message(server, client, entry->status); + return 0; } @@ -366,10 +372,28 @@ void discover_server_notify_device_remove(struct discover_server *server, } void discover_server_notify_boot_status(struct discover_server *server, - struct boot_status *status) + struct status *status) { + struct statuslog_entry *entry; struct client *client; + /* Duplicate the status struct to add to the backlog */ + entry = talloc(server, struct statuslog_entry); + if (!entry) { + pb_log("Failed to allocated saved status!\n"); + } else { + entry->status = talloc(entry, struct status); + if (entry->status) { + entry->status->type = status->type; + entry->status->message = talloc_strdup(entry->status, + status->message); + entry->status->backlog = true; + list_add_tail(&server->status, &entry->list); + } else { + talloc_free(entry); + } + } + list_for_each_entry(&server->clients, client, list) write_boot_status_message(server, client, status); } @@ -410,6 +434,7 @@ struct discover_server *discover_server_init(struct waitset *waitset) server->waiter = NULL; server->waitset = waitset; list_init(&server->clients); + list_init(&server->status); unlink(PB_SOCKET_PATH);