discover: Add countdown before default boot

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 2509457376e021d6bbdc20501d4bf358a5195fb8..67ce266c4c433fced328f810360094cd8e60f10f 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -203,8 +203,8 @@ static int discover_server_process_message(void *arg)
 static int discover_server_process_connection(void *arg)
 {
        struct discover_server *server = arg;
+       int fd, rc, i, n_devices;
        struct client *client;
-       int fd, i, n_devices;
 
        /* accept the incoming connection */
        fd = accept(server->socket, NULL, 0);
@@ -229,15 +229,21 @@ static int discover_server_process_connection(void *arg)
                const struct discover_device *device;
 
                device = device_handler_get_device(server->device_handler, i);
-               write_device_add_message(server, client, device->device);
+               rc = write_device_add_message(server, client, device->device);
+               if (rc)
+                       return 0;
 
-               list_for_each_entry(&device->boot_options, opt, list)
-                       write_boot_option_add_message(server, client,
+               list_for_each_entry(&device->boot_options, opt, list) {
+                       rc = write_boot_option_add_message(server, client,
                                        opt->option);
+                       if (rc)
+                               return 0;
+               }
        }
 
-       client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN,
-                               discover_server_process_message, client);
+       client->waiter = waiter_register_io(server->waitset, client->fd,
+                               WAIT_IN, discover_server_process_message,
+                               client);
 
        return 0;
 }
@@ -322,7 +328,7 @@ struct discover_server *discover_server_init(struct waitset *waitset)
                goto out_err;
        }
 
-       server->waiter = waiter_register(server->waitset, server->socket,
+       server->waiter = waiter_register_io(server->waitset, server->socket,
                        WAIT_IN, discover_server_process_connection, server);
 
        return server;