ui: callback & boot actions: kexec -> boot

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 56a427b85ac9806a11ff20a9dd34b1bd53eaecfc..21e15da4c84e64219134274996ec9d09106cf2ba 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -22,6 +22,7 @@
 
 struct discover_server {
        int socket;
+       struct waitset *waitset;
        struct waiter *waiter;
        struct list clients;
        struct device_handler *device_handler;
@@ -66,12 +67,12 @@ static void print_clients(struct discover_server *server)
 {
        struct client *client;
 
-       printf("current clients [%p,%p,%p]:\n",
+       pb_log("current clients [%p,%p,%p]:\n",
                        &server->clients.head,
                        server->clients.head.prev,
                        server->clients.head.next);
        list_for_each_entry(&server->clients, client, list)
-               printf("\t[%p,%p,%p] client: %d\n", &client->list,
+               pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
                                client->list.prev, client->list.next,
                                client->fd);
 }
@@ -90,7 +91,7 @@ static int client_write_message(
 }
 
 static int write_add_message(struct discover_server *server,
-               struct client *client, struct device *dev)
+               struct client *client, const struct device *dev)
 {
        struct pb_protocol_message *message;
        int len;
@@ -128,7 +129,6 @@ static int write_remove_message(struct discover_server *server,
 static int discover_server_process(void *arg)
 {
        struct discover_server *server = arg;
-       struct device *devices;
        struct client *client;
        int fd, i, n_devices;
 
@@ -148,10 +148,13 @@ static int discover_server_process(void *arg)
        client->fd = fd;
 
        /* send existing devices to client */
-       n_devices = device_handler_get_current_devices(server->device_handler,
-                       &devices);
-       for (i = 0; i < n_devices; i++)
-               write_add_message(server, client, &devices[i]);
+       n_devices = device_handler_get_device_count(server->device_handler);
+       for (i = 0; i < n_devices; i++) {
+               const struct device *device;
+
+               device = device_handler_get_device(server->device_handler, i);
+               write_add_message(server, client, device);
+       }
 
        return 0;
 }
@@ -182,7 +185,7 @@ void discover_server_set_device_source(struct discover_server *server,
        server->device_handler = handler;
 }
 
-struct discover_server *discover_server_init(void)
+struct discover_server *discover_server_init(struct waitset *waitset)
 {
        struct discover_server *server;
        struct sockaddr_un addr;
@@ -192,6 +195,7 @@ struct discover_server *discover_server_init(void)
                return NULL;
 
        server->waiter = NULL;
+       server->waitset = waitset;
        list_init(&server->clients);
 
        unlink(PB_SOCKET_PATH);
@@ -217,8 +221,8 @@ struct discover_server *discover_server_init(void)
                goto out_err;
        }
 
-       server->waiter = waiter_register(server->socket, WAIT_IN,
-                       discover_server_process, server);
+       server->waiter = waiter_register(server->waitset, server->socket,
+                       WAIT_IN, discover_server_process, server);
 
        return server;