discover: Send options to client in order
[petitboot] / discover / discover-server.c
index 3f08152601a05640b1b72996cc5575d549518e89..4ba91eeba5526c3ce85bd87e4c181fe542a434af 100644 (file)
@@ -31,6 +31,7 @@ struct discover_server {
 struct client {
        struct discover_server *server;
        struct list_item list;
+       struct waiter *waiter;
        int fd;
 };
 
@@ -55,6 +56,9 @@ static int client_destructor(void *arg)
        if (client->fd >= 0)
                close(client->fd);
 
+       if (client->waiter)
+               waiter_remove(client->waiter);
+
        list_remove(&client->list);
 
        return 0;
@@ -172,8 +176,11 @@ static int discover_server_process_message(void *arg)
 
        message = pb_protocol_read_message(client, client->fd);
 
-       if (!message)
+       if (!message) {
+               talloc_free(client);
                return 0;
+       }
+
 
        if (message->action != PB_PROTOCOL_ACTION_BOOT) {
                pb_log("%s: invalid action %d\n", __func__, message->action);
@@ -196,18 +203,18 @@ 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);
-       if (!fd) {
+       if (fd < 0) {
                pb_log("accept: %s\n", strerror(errno));
                return 0;
        }
 
        /* add to our list of clients */
-       client = talloc(server, struct client);
+       client = talloc_zero(server, struct client);
        list_add(&server->clients, &client->list);
 
        talloc_set_destructor(client, client_destructor);
@@ -222,16 +229,20 @@ 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)
-                       discover_server_notify_boot_option_add(server,
+               list_for_each_entry(&device->boot_options, opt, list) {
+                       rc = write_boot_option_add_message(server, client,
                                        opt->option);
-
+                       if (rc)
+                               return 0;
+               }
        }
 
-       waiter_register(server->waitset, client->fd, WAIT_IN,
-                       discover_server_process_message, client);
+       client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN,
+                               discover_server_process_message, client);
 
        return 0;
 }