discover: destroy client if message read failed

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 198793204ef0cd30a68bb7da80858fd3a7791cdd..138551ab2ddfa841a6e1533a884ee69541c02b30 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -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;
@@ -145,6 +149,24 @@ static int write_device_remove_message(struct discover_server *server,
        return client_write_message(server, client, message);
 }
 
+static int write_boot_status_message(struct discover_server *server,
+               struct client *client, const struct boot_status *status)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_boot_status_len(status);
+
+       message = pb_protocol_create_message(client,
+                       PB_PROTOCOL_ACTION_STATUS, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_boot_status(status, message->payload, len);
+
+       return client_write_message(server, client, message);
+}
+
 static int discover_server_process_message(void *arg)
 {
        struct pb_protocol_message *message;
@@ -154,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);
@@ -189,7 +214,7 @@ static int discover_server_process_connection(void *arg)
        }
 
        /* 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);
@@ -207,13 +232,12 @@ static int discover_server_process_connection(void *arg)
                write_device_add_message(server, client, device->device);
 
                list_for_each_entry(&device->boot_options, opt, list)
-                       discover_server_notify_boot_option_add(server,
+                       write_boot_option_add_message(server, client,
                                        opt->option);
-
        }
 
-       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;
 }
@@ -247,6 +271,15 @@ 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 client *client;
+
+       list_for_each_entry(&server->clients, client, list)
+               write_boot_status_message(server, client, status);
+}
+
 void discover_server_set_device_source(struct discover_server *server,
                struct device_handler *handler)
 {